telepathy-glib: Merge branch 'telepathy-glib-0.22'

[Simon McVittie]

Module: telepathy-glib
Branch: master
Commit: 7b6e496317a332b81fb079256f7995cf082b5c57
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=7b6e496317a332b81fb079256f7995cf082b5c57

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Oct  2 16:44:31 2013 +0100

Merge branch 'telepathy-glib-0.22'

Conflicts:
	NEWS
	configure.ac

---