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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Nov 11 20:37:52 2013 +0000

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

Oops, pushed too early.

---