[next] telepathy-glib: Merge branch 'gdbus-prep2' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Mar 14 18:53:53 2014 +0000

Merge branch 'gdbus-prep2' into next

Reviewed-by: Guillaume Desmottes
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=76120

---