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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Oct  8 13:26:41 2012 +0100

Merge branch 'telepathy-glib-0.20'

Conflicts:
	NEWS

---