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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Sep 17 12:22:08 2014 +0100

Merge branch 'master' into next

Conflicts:
	Makefile.am
	NEWS
	configure.ac
	docs/reference/Makefile.am
	telepathy-glib/Makefile.am
	telepathy-glib/util.h

---