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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Jan  3 18:20:30 2013 +0000

Merge branch 'master' into next

Conflicts:
	configure.ac
	telepathy-glib/client-channel-factory.c
	tests/dbus/contact-lists.c
	tools/glib-client-gen.py

---