[next] telepathy-glib: Merge commit ' 484abc61967d4b18b8aa97f9fe5b15d6e9475920' into next

[Simon McVittie]

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

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

Merge commit '484abc61967d4b18b8aa97f9fe5b15d6e9475920' into next

Conflicts:
	telepathy-glib/properties-mixin.c

---