[next] telepathy-glib: Merge commit ' 21b395c356549d821b30253f6ec5be8dbd15e333' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Sep 13 17:18:26 2013 +0100

Merge commit '21b395c356549d821b30253f6ec5be8dbd15e333' into next

Conflicts:
	examples/client/dbus-tubes/offerer.c
	examples/client/extended-client.c
	examples/client/stream-tubes/offerer.c
	telepathy-glib/account-manager.c
	telepathy-glib/account.c
	telepathy-glib/channel-dispatch-operation.c
	telepathy-glib/channel-request.c
	telepathy-glib/client-factory.c

---