[Telepathy-commits] merge: telepathy-idle

[Merge Monkey]

Merge to:

  telepathy-idle

From:

  /home/oggis/public_html/telepathy-idle-fdo-bugs

Changes:

  Olli Salli <olli.salli at collabora.co.uk>
    Check that the channels hash table actually exists before doing anything with it. Should fix fdo #11122

  Olli Salli <olli.salli at collabora.co.uk>
    Change IdleMUCChannels's join-ready marshaller to the correct one, should fix fdo #11121