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

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Mon Jan 20 14:46:17 2014 +0100

Merge branch 'telepathy-glib-0.22'

---