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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Jan  7 13:03:09 2013 +0000

Merge branch 'telepathy-glib-0.20'

Conflicts:
	NEWS

---