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

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Mar 18 12:33:32 2014 +0100

Merge branch 'master' into next

Conflicts:
	NEWS
	configure.ac
	telepathy-glib/abi.am
	telepathy-glib/protocol.c
	telepathy-glib/protocol.h

---