[Telepathy-commits] merge: telepathy-python

[Merge Monkey]

Merge to:

  telepathy-python

From:

  telepathy-python-daf

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    when incoming call ends, wait for another call

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    call.py: close channel on StreamError signal

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    register.py: print failure code

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add example for discovering existing connections

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    call.py: remove unused variable

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    chatroom.py: strip trailing newline