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

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Mon Mar  3 14:39:05 2014 +0100

Merge branch 'master' into next-protocol

Conflicts:
	docs/reference/telepathy-glib-sections.txt
	telepathy-glib/protocol.h
	tests/dbus/protocol-objects.c

---