[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  telepathy-gabble-testing

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    gabbletest.py: if root element is passed to streamStarted, copy ID from it to xmlstream session ID for compatibility with Twisted Words 8.0

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    ignore second argument passed to streamStarted, for compatibility with Twisted Words 8.0

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    port test-register.py to new test API

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    port test-capabilities.py to new test API

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    port test-connect-fail.py to new test API