[telepathy-gabble-0.18] telepathy-gabble: Merge remote-tracking branch ' origin/telepathy-gabble-0.18' into telepathy-gabble-0.18

[Simon McVittie]

Module: telepathy-gabble
Branch: telepathy-gabble-0.18
Commit: 5776d2f6bf2dce4efc7754793abf9db1dd731c30
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=5776d2f6bf2dce4efc7754793abf9db1dd731c30

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed May  7 15:42:59 2014 +0100

Merge remote-tracking branch 'origin/telepathy-gabble-0.18' into telepathy-gabble-0.18

---