[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

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

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-r-multicast-transport.c: fix priv->name leak

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact-manager: destroy olpc_activities_by_room and olpc_activities_by_mdns when closing the factory

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-r-multicast-transport.c: g_free doesn't need an "if not NULL" guard

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact: fix 2 OLPC specifc string leaks

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-channel.c: fix 2 TpIntSet when changing group members