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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Sat Sep 15 15:47:29 2012 +0200

Merge branch 'master' into next

Conflicts:
	telepathy-glib/Makefile.am
	telepathy-glib/account.c
	telepathy-glib/channel-contacts.c
	telepathy-glib/channel.c

---