telepathy-gabble: Merge branch '57546-there-can-be-only-one-jingletest'

[Will Thompson]

Module: telepathy-gabble
Branch: master
Commit: 0adea4c2574e53a687e20177175c18a5ce038767
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=0adea4c2574e53a687e20177175c18a5ce038767

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Thu Dec  6 12:43:41 2012 +0000

Merge branch '57546-there-can-be-only-one-jingletest'

https://bugs.freedesktop.org/show_bug.cgi?id=57546

---