[next] telepathy-glib: Merge branch 'master' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Oct  8 14:34:06 2012 +0100

Merge branch 'master' into next

Conflicts:
	configure.ac
	docs/reference/telepathy-glib-sections.txt
	telepathy-glib/abi.am
	telepathy-glib/channel-request.c
	telepathy-glib/connection.c
	telepathy-glib/contact.c
	telepathy-glib/message.c
	tests/dbus/account-channel-request.c
	tests/dbus/self-handle.c
	tests/lib/simple-conn.c

---