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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Tue Jul 10 16:06:53 2012 +0200

Merge branch 'master' into next

Conflicts:
	configure.ac
	telepathy-glib/abi.am
	telepathy-glib/account.h
	telepathy-glib/automatic-proxy-factory.c
	telepathy-glib/base-channel.h
	telepathy-glib/base-client.c
	telepathy-glib/base-connection-manager.c
	telepathy-glib/base-connection-manager.h
	telepathy-glib/base-connection.c
	telepathy-glib/client-channel-factory.c
	telepathy-glib/connection.h
	tests/dbus/connection-balance.c
	tests/dbus/protocol-objects.c
	tests/lib/bug16307-conn.c
	tests/lib/contacts-conn.c
	tests/lib/echo-cm.c
	tests/lib/echo-conn.c

---