[next] telepathy-glib: Merge commit ' b3570e8e77cb890c62744dc62859c49a6bebd8aa' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 12 16:23:25 2013 +0100

Merge commit 'b3570e8e77cb890c62744dc62859c49a6bebd8aa' into next

Conflicts:
	telepathy-glib/connection-contact-list.c
	tests/dbus/call-channel.c

---