telepathy-glib: Merge branch 'telepathy-glib-0.18' into vala

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri May 11 17:02:34 2012 +0100

Merge branch 'telepathy-glib-0.18' into vala

---