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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Jan  7 15:47:06 2014 +0000

Merge branch 'master' into next

[Also remove g_type_init() from the Logger, matching
telepathy-glib. -smcv]

Conflicts:
	examples/client/js/contact-list.js
	examples/client/js/debug-client.js
	examples/client/python/contact-list.py
	examples/client/python/dialler.py
	examples/client/python/ensure-channel.py
	examples/client/python/file-transfer.py
	examples/client/python/ft-handler.py
	examples/client/python/inspect-cm.py
	examples/client/python/stream-tube-accepter.py
	examples/client/python/stream-tube-offerer.py
	examples/client/python/text-handler.py
	examples/client/stream-tubes/offerer.c
	telepathy-glib/file-transfer-channel.c
	tests/dbus/connection-balance.c
	tests/dbus/connection-bug-18845.c
	tests/dbus/connection-getinterfaces-failure.c
	tests/dbus/connection-handles.c
	tests/dbus/connection-inject-bug16307.c
	tests/dbus/params-cm.c
	tests/dbus/text-mixin.c
	tests/enums.c

---