[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>
    examples/tube-dbus-muc.py: add a workaround to be sure to join the right room when using Salut

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    update to spec 0.16.0