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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Mar 13 13:54:16 2014 +0000

Merge branch 'telepathy-glib-0.22'

Conflicts:
	NEWS

---