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

[Guillaume Desmottes]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Jan 29 12:58:38 2014 +0000

Merge branch 'telepathy-glib-0.22'

Conflicts:
	NEWS
	configure.ac

---