[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>
    fix olpc-muc-prop-change.py

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix olpc-muc-invitation.py. return False doesn't make the test fail as with the old API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix test-olpc-set-props-preload.py