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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Fri Sep  7 21:08:44 2012 +0200

Merge branch 'master' into next

Conflicts:
	configure.ac
	docs/reference/telepathy-glib-sections.txt
	examples/client/contact-list.c
	telepathy-glib/abi.am
	telepathy-glib/account-manager.c
	telepathy-glib/account-manager.h
	telepathy-glib/call-channel.c
	telepathy-glib/channel.c
	telepathy-glib/protocol.h
	telepathy-glib/proxy.c
	telepathy-glib/stream-tube-channel.c
	telepathy-glib/text-channel.c
	tools/glib-client-gen.py

---