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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Oct  2 20:05:32 2013 +0100

Merge branch 'telepathy-glib-0.22' into next

For simplicity I just left out the NEWS update. We'll get that
along with the merge of 0.23.

Conflicts:
	NEWS
	configure.ac
	telepathy-glib/contact.c

---