[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-sjoerd

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: salut_muc_channel_publish_service: return if muc_group is NULL instead of asserting

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutMucChannel: Return the correct type if we're already announcing a clique group

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutMucManager: If we're not compiled with tubes support, then a si request for a tube is always an error case