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

[Simon McVittie]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Mar 12 16:40:22 2013 +0100

Merge branch 'telepathy-glib-0.20'

---