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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Nov 11 19:45:13 2013 +0000

Merge branch 'master' into next

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

---