[next] telepathy-glib: Merge remote-tracking branch 'origin/master' into next

[Guillaume Desmottes]

Module: telepathy-glib
Branch: next
Commit: 881e23643166d7519969f6ab53dda2231035fbc1
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=881e23643166d7519969f6ab53dda2231035fbc1

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu Mar 13 15:47:43 2014 +0100

Merge remote-tracking branch 'origin/master' into next

---