[Telepathy-commits] merge: telepathy-python

[Merge Monkey]

Merge to:

  telepathy-python

From:

  /home/cassidy/public_html/darcs/telepathy-python-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus-muc.py: don't crash if the connection immediately fails

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus-muc: remove useless 'global'

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus-muc: actually use the global 'loop' variable