[next] telepathy-glib: Merge commit ' 8608a306e80f3aec068c36c83e17f35c52df1381' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 12 16:26:08 2013 +0100

Merge commit '8608a306e80f3aec068c36c83e17f35c52df1381' into next

Conflicts:
	telepathy-glib/contact.c
	telepathy-glib/contact.h

---