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

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Wed Sep 25 15:49:58 2013 -0400

Merge branch 'master' into next

Conflicts:
	tests/lib/broken-client-types-conn.c
	tests/lib/bug-19101-conn.c
	tests/lib/bug16307-conn.c
	tests/lib/bug16307-conn.h
	tests/lib/contacts-conn.c
	tests/lib/contacts-conn.h
	tests/lib/dbus-tube-chan.c
	tests/lib/echo-chan.c
	tests/lib/echo-chan.h
	tests/lib/echo-cm.h
	tests/lib/echo-conn.c
	tests/lib/echo-conn.h
	tests/lib/file-transfer-chan.c
	tests/lib/params-cm.c
	tests/lib/params-cm.h
	tests/lib/room-list-chan.c
	tests/lib/simple-channel-manager.c
	tests/lib/simple-channel-request.c
	tests/lib/simple-client.h
	tests/lib/simple-conn.c
	tests/lib/simple-manager.c
	tests/lib/simple-manager.h
	tests/lib/stream-tube-chan.c
	tests/lib/textchan-group.h
	tests/lib/textchan-null.c
	tests/lib/textchan-null.h
	tests/lib/tls-certificate.c
	tests/lib/util.c

---