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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Tue Sep 11 17:18:10 2012 +0200

Merge branch 'master' into next

Conflicts:
	configure.ac
	telepathy-glib/abi.am
	telepathy-glib/account-manager.c
	telepathy-glib/codegen.am
	telepathy-glib/connection-contact-list.c
	telepathy-glib/contact.c
	telepathy-glib/properties-mixin.h
	tools/glib-ginterface-gen.py

---