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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Mon May 14 15:09:01 2012 +0200

Merge branch 'master' into next

Conflicts:
	tests/dbus/connection.c

---