[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/tester/public_html/darcs/telepathy-gabble-tester

Changes:

  Olivier Crete <olivier.crete at collabora.co.uk>
    Ignore non-1 components for now