[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-fix-invite

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    don't use TP_CHANNEL_GROUP_CHANGE_REASON_INVITED when user joins a muc

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    destroy TpIntSet in muc_connection_connected_cb

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    when joining a muc, set yourself as remote-pending while the muc connection isn't connected

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    revert delayed muc channel creation