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

[Jonny Lamb]

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

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Fri Aug 31 11:12:24 2012 +0100

Merge branch 'master' into next

Conflicts:
	configure.ac
	telepathy-glib/abi.am
	telepathy-glib/base-client.c
	telepathy-glib/base-connection.c
	telepathy-glib/codegen.am
	telepathy-glib/contact.c

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

---