[next] telepathy-glib: Merge commit ' 6adc3a97491b8aef64ac00a5efa5685fc5f2c6b7' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Sep 13 16:48:22 2013 +0100

Merge commit '6adc3a97491b8aef64ac00a5efa5685fc5f2c6b7' into next

---