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

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu Oct 24 14:54:32 2013 +0200

Merge branch 'telepathy-glib-0.22'

---