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

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Mon May 26 14:13:39 2014 +0200

Merge branch 'master' into next

Conflicts:
	Makefile.am
	NEWS
	configure.ac
	docs/reference/Makefile.am
	tools/glib-client-marshaller-gen.py

---