[next] telepathy-glib: Merge commit ' 6c2ba1a537ade5c26b7aa8d3b511c0ae8336c6e4' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 12 17:07:08 2013 +0100

Merge commit '6c2ba1a537ade5c26b7aa8d3b511c0ae8336c6e4' into next

Conflicts:
	configure.ac
	telepathy-glib/connection.c

---