[next] telepathy-glib: Merge commit ' 53d1e1aa87a73db22ffe1e2ffe22b9201b79de41' into next

[Xavier Claessens]

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

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

Merge commit '53d1e1aa87a73db22ffe1e2ffe22b9201b79de41' into next

Conflicts:
	NEWS
	configure.ac

---