[next] telepathy-glib: Merge commit ' 8685a6d9368307046b3d21099ed2d33770a84ece' into next

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Wed Sep 25 15:29:07 2013 -0400

Merge commit '8685a6d9368307046b3d21099ed2d33770a84ece' into next

Conflicts:
	telepathy-glib/contact.c

---