[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-trivia

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    tests/Makefile.am: sort TWISTED_TESTS