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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Thu May  3 12:50:45 2012 +0200

Merge branch 'master' into next

Conflicts:
	docs/reference/telepathy-glib-sections.txt
	telepathy-glib/contact.h

---