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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Mar 18 14:04:30 2014 +0000

Merge branch 'master' into next

Conflicts:
	NEWS
	tools/glib-client-gen.py

---