[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove duplicate copy of muc_connection_new_sender_cb caused by diff|patch merging

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tubes-channel: remove the "request" attribute in tubes announces (re-recorded)
Originally by Guillaume, re-recorded to avoid depending on his stream tubes work.

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: send tubes info when get a "new-sender" event