[next] telepathy-glib: Merge commit ' 7ba46141a7bfd7469ed1dba1d2938b2b62a10f85' into next

[Xavier Claessens]

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

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

Merge commit '7ba46141a7bfd7469ed1dba1d2938b2b62a10f85' into next

Conflicts:
	docs/reference/telepathy-glib-sections.txt
	spec/Channel.xml
	spec/Connection.xml
	telepathy-glib/base-connection.c

---