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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Sep  4 14:04:58 2013 +0100

Merge branch 'telepathy-glib-0.20'

Conflicts:
	NEWS

---