telepathy-glib: Merge remote-tracking branch 'origin/telepathy-glib-0.24'

[Simon McVittie]

Module: telepathy-glib
Branch: master
Commit: 2487d4f72c00fbac6fa2f9e32e4e72404e24ae96
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=2487d4f72c00fbac6fa2f9e32e4e72404e24ae96

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Sep 17 11:55:28 2014 +0100

Merge remote-tracking branch 'origin/telepathy-glib-0.24'

---