[next] telepathy-glib: Merge branch 'next-merge' into next

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Oct 29 14:25:01 2013 +0100

Merge branch 'next-merge' into next

---