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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Wed Dec 26 10:03:57 2012 +0100

Merge branch 'master' into next

Conflicts:
	telepathy-glib/util.h

---