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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Mon May 14 13:16:10 2012 +0200

Merge branch 'master' into next

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

---