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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Jan 28 13:50:51 2013 +0000

Merge branch 'telepathy-glib-0.18' into telepathy-glib-0.20

Conflicts:
	NEWS

---