[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>
    stream_tube_client.py: improve trivial client/server debug messages

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    stream_tube_client.py: use inet socket and modify trivial client/server to do so

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    cast port to dbus.UInt16 in stream tubes examples

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    Wait we have really joined the muc before offering the stream tubes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    update tube-stream-private.py and tube-stream-muc.py: to be able to specifiy a ip/port on the commande line

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
     Wait we have really joined the muc before offering the D-Bus tube