[next] telepathy-glib: Merge remote-tracking branch 'origin/next' into HEAD

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Oct 11 16:28:35 2013 +0100

Merge remote-tracking branch 'origin/next' into HEAD

---