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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Wed May 16 15:28:10 2012 +0200

Merge branch 'master' into next

Conflicts:
	docs/reference/telepathy-glib-sections.txt
	telepathy-glib/connection-contact-list.c
	telepathy-glib/simple-client-factory.h

---