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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Apr 30 18:42:40 2012 +0100

Merge branch 'master' into next

Conflicts:
	telepathy-glib/channel.c
	telepathy-glib/text-mixin.c
	telepathy-glib/text-mixin.h
	tests/lib/echo-chan.c
	tests/lib/simple-conn.c
	tests/lib/simple-conn.h
	tests/lib/textchan-group.c
	tests/lib/textchan-null.c

---