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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed May  2 12:15:26 2012 +0100

Merge branch 'telepathy-glib-0.18'

Conflicts:
	NEWS

---