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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Mar 13 13:57:09 2014 +0000

Merge branch 'master' into next

Conflicts:
	NEWS

---