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

Fri Apr 20 10:38:59 PDT 2012

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Apr 20 18:31:34 2012 +0100

Merge branch 'telepathy-glib-0.18'

Conflicts:
	NEWS
	configure.ac

---