[next] telepathy-glib: Merge branch 'telepathy-glib-0.20'

[Simon McVittie]

Module: telepathy-glib
Branch: next
Commit: fc5fdd26527e77f5f84a08f4475cc9984ccd7533
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=fc5fdd26527e77f5f84a08f4475cc9984ccd7533

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Jan 28 13:52:17 2013 +0000

Merge branch 'telepathy-glib-0.20'

Conflicts:
	NEWS

---