[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/alban/public_html/darcs/telepathy-gabble-alban-tests

Changes:

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix race in tests: do not request a channel before Gabble receive the caps

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    gabbletest.py: add sync_stream function to allow forcing processing of sent stanzas