[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-new-tubes-spec

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    update extensions/Channel_Type_Tubes.xml

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-tubes-channel.c: updated to fit latest spec

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-tubes-channel.c: remove HAVE_DBUS_TUBE tests as now we always build D-Bus tubes