[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  telepathy-gabble-testing

Changes:

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