[next] telepathy-glib: Merge remote-tracking branch 'origin/ telepathy-glib-0.18'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Apr 16 19:53:41 2012 +0100

Merge remote-tracking branch 'origin/telepathy-glib-0.18'

---