[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-cassidy-to-review

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    update tubes spec to 0.15.5

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-tubes-channel.c: updated to fit spec 0.15.5 + implement old tubes API for backwards compatibilty