[Telepathy-commits] merge: telepathy-haze

[Merge Monkey]

Merge to:

  telepathy-haze

From:

  telepathy-haze-resiak

Changes:

  Will Thompson <will.thompson at collabora.co.uk>
    Free contact list channels' object paths.

  Will Thompson <will.thompson at collabora.co.uk>
    Bump libpurple version requirement to 2.1.1; remove corresponding #ifdefs