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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Jun 11 15:48:20 2013 +0100

Merge branch 'telepathy-glib-0.20'

Conflicts:
	NEWS

---