[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>
    Add GIBBER_NODE_ASSIGN_TO opcode to gibber_xmpp_stanza_build

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberTransport: Add disconnecting state

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use gibber_xmpp_stanza_build to build invitation messages