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

[Simon McVittie]

Module: telepathy-glib
Branch: telepathy-glib-0.20
Commit: 12e8b215512e99b8f11a2800b8f9842c59dd38d6
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=12e8b215512e99b8f11a2800b8f9842c59dd38d6

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Jan  7 11:55:28 2013 +0000

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

Conflicts:
	NEWS

---