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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 26 16:32:32 2013 +0100

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

Conflicts:
	NEWS

---