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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Mon Jun  4 12:58:08 2012 +0200

Merge branch 'master' into next

Conflicts:
	telepathy-glib/connection-contact-list.c
	telepathy-glib/connection.c

---