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

[Simon McVittie]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Apr 27 10:44:05 2012 +0200

Merge branch 'telepathy-glib-0.18'

---