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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Jan  3 18:18:39 2013 +0000

Merge branch 'telepathy-glib-0.20'

Conflicts:
	NEWS
	configure.ac

---