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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Wed May  9 20:45:36 2012 +0200

Merge branch 'master' into next

Conflicts:
	configure.ac
	docs/reference/telepathy-glib-sections.txt
	examples/client/extended-client.c
	examples/client/inspect-contact.c
	examples/cm/echo-message-parts/chan.c
	spec/Protocol_Interface_Presence1.xml
	spec/all.xml
	telepathy-glib/Makefile.am
	telepathy-glib/abi.am
	telepathy-glib/base-connection.c
	telepathy-glib/base-connection.h
	telepathy-glib/connection-contact-list.c
	telepathy-glib/contacts-mixin.c
	telepathy-glib/intset.c
	telepathy-glib/message-mixin.c
	telepathy-glib/message-mixin.h
	telepathy-glib/stream-tube-channel.c
	telepathy-glib/text-channel.c
	tests/lib/util.c

---