[Telepathy-commits] merge: telepathy-haze

[Merge Monkey]

Merge to:

  telepathy-haze

From:

  telepathy-haze-resiak

Changes:

  Will Thompson <will.thompson at collabora.co.uk>
    Make haze_contact_list_get_channel a public function.

  Will Thompson <will.thompson at collabora.co.uk>
    Send apostrophes literally, rather than as "&apos;".
Fixes #13618.  This apparently was only a problem on Yahoo! where &apos; isn't
understood; other protocols seem fine with that particular entity.

  Will Thompson <will.thompson at collabora.co.uk>
    Include build-time and run-time versions of libpurple in debug output.