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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Aug 20 21:02:46 2013 +0100

Merge branch 'telepathy-glib-0.20'

Conflicts:
	NEWS
	configure.ac

---