[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

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

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_params_free: don't leak the published-name

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-bytestream-manager: don't leak our streaminit_reply_cb_data structure if the XMPP connection failed