[next] telepathy-gabble: Merge branch 'master' into next-merge

[Guillaume Desmottes]

Module: telepathy-gabble
Branch: next
Commit: e3ad134743120c99d630e4ab0992fb876cac741e
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=e3ad134743120c99d630e4ab0992fb876cac741e

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Feb 14 13:53:25 2014 +0100

Merge branch 'master' into next-merge

---