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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Mon Jun 11 21:18:34 2012 +0200

Merge branch 'master' into next

Conflicts:
	configure.ac
	telepathy-glib/abi.am
	telepathy-glib/account.h
	telepathy-glib/channel-manager.c
	telepathy-glib/channel-manager.h
	telepathy-glib/connection.h
	telepathy-glib/handle-repo.h
	telepathy-glib/simple-client-factory.h

---