[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/smcv/public_html/darcs/salut-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    SalutMucManager: return the existing tubes channel when signalling EXISTING (dev.laptop.org #4565)