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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 26 18:30:40 2013 +0100

Merge branch 'master' into next

Conflicts:
	NEWS
	configure.ac
	docs/reference/telepathy-glib-sections.txt
	examples/cm/contactlist/conn.c
	telepathy-glib/account.c
	telepathy-glib/base-connection-manager.c
	telepathy-glib/base-connection.c
	telepathy-glib/group-mixin.c
	telepathy-glib/message-mixin.c
	telepathy-glib/presence-mixin.c
	telepathy-glib/text-mixin.c
	tests/dbus/channel-dispatch-operation.c
	tests/dbus/client-channel-factory.c
	tests/dbus/contacts-slow-path.c
	tests/dbus/contacts.c
	tests/dbus/dbus-uninstalled/services/spurious.service
	tests/dbus/params-cm.c
	tests/lib/broken-client-types-conn.c
	tests/lib/contacts-conn.c
	tools/glib-client-gen.py

---