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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Tue Jun  5 11:39:43 2012 +0200

Merge branch 'master' into next

Conflicts:
	examples/cm/call/conn.c
	examples/cm/channelspecific/conn.c
	examples/cm/channelspecific/room.c
	examples/cm/contactlist/conn.c
	examples/cm/echo-message-parts/conn.c
	examples/cm/extended/conn.c
	telepathy-glib/base-connection.c
	telepathy-glib/base-connection.h
	telepathy-glib/base-contact-list.c
	telepathy-glib/contact-list-channel.c
	telepathy-glib/presence-mixin.c
	tests/dbus/channel-request.c
	tests/dbus/contacts-slow-path.c
	tests/lib/bug-19101-conn.c
	tests/lib/bug16307-conn.c
	tests/lib/echo-conn.c
	tests/lib/simple-channel-request.c
	tests/lib/simple-conn.c
	tests/lib/textchan-group.c

---