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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Fri Jun 29 15:37:39 2012 +0200

Merge branch 'master' into next

Conflicts:
	configure.ac
	telepathy-glib/abi.am
	telepathy-glib/base-channel.h
	telepathy-glib/base-connection-manager.c
	telepathy-glib/base-connection-manager.h
	telepathy-glib/base-connection.c
	telepathy-glib/contact.c
	telepathy-glib/contacts-mixin.c
	tests/dbus/cm.c

---