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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Thu May 10 16:48:18 2012 +0200

Merge branch 'master' into next

Conflicts:
	examples/cm/channelspecific/room.c
	telepathy-glib/base-contact-list.c
	telepathy-glib/connection-contact-list.c
	telepathy-glib/connection-handles.c
	telepathy-glib/connection.h
	telepathy-glib/contact.c
	telepathy-glib/contacts-mixin.c
	tests/dbus/message-mixin.c
	tests/lib/contact-list-manager.c

---