[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_tube_dbus_constructor: when handle_type is room, the bytestream have to be of type GibberBytestreamMuc

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: fix a reference leak when creating the muc bytestream

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact: GError have to be freed using g_error_free, not g_free