[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-olpc-set-props-preload.py: port to new test API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    olpc-muc-invitation.py: port to new test API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    olpc-muc-prop-change.py: port to new test API