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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Fri May 11 17:12:29 2012 +0200

Merge branch 'master' into next

Conflicts:
	telepathy-glib/contact.c
	tests/dbus/contacts.c

---