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

[Simon McVittie]

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

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Wed Jan  9 10:00:56 2013 +0000

Merge branch 'telepathy-glib-0.20'

---