telepathy-gabble: Merge branch 'xep-0184'

[Will Thompson]

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

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Thu Dec  6 18:35:37 2012 +0000

Merge branch 'xep-0184'

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

---