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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon May  7 15:34:13 2012 +0100

Merge branch 'master' into next

Conflicts:
	docs/reference/telepathy-glib-sections.txt
	examples/client/approver.c
	examples/cm/call/call-manager.c
	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/chan.c
	examples/cm/echo-message-parts/conn.c
	examples/cm/extended/conn.c
	telepathy-glib/Makefile.am
	telepathy-glib/base-contact-list-internal.h
	telepathy-glib/contact.h
	telepathy-glib/dbus-properties-mixin-internal.h
	telepathy-glib/telepathy-glib-dbus.h
	telepathy-glib/telepathy-glib.h
	tools/glib-client-gen.py

---