[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-factory: remove useless double instructions

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-factory: fix text_needed_for_tubes leak

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-stream: close_each_extra_bytestream: Don't remove element from priv->fd_to_bytestream hash table when we are iterating over it. Fix a memory corruption bug