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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Jun 10 15:26:52 2013 +0100

Merge branch 'telepathy-glib-0.20'

Conflicts:
	NEWS

---