[next] telepathy-glib: Merge remote-tracking branch 'origin/master' into next-merge

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu Feb 27 16:52:44 2014 +0100

Merge remote-tracking branch 'origin/master' into next-merge

Conflicts:
	NEWS
	configure.ac
	docs/reference/telepathy-glib-sections.txt
	telepathy-glib/abi.am
	telepathy-glib/account-channel-request.c
	telepathy-glib/base-connection.c
	telepathy-glib/base-connection.h
	telepathy-glib/presence-mixin.c
	telepathy-glib/presence-mixin.h
	telepathy-glib/protocol.c
	telepathy-glib/protocol.h
	tests/dbus/account-channel-request.c

---