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

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu Mar 13 15:41:20 2014 +0100

Merge branch 'telepathy-glib-0.22'

Conflicts:
	telepathy-glib/contact.c

---