[next] telepathy-glib: Merge commit ' 9efb9966e3d7425d15ac1038584aadc8e81ac56c' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Sep 13 16:46:19 2013 +0100

Merge commit '9efb9966e3d7425d15ac1038584aadc8e81ac56c' into next

Conflicts:
	telepathy-glib/connection-manager.c
	tests/dbus/cm.c

---