[next] telepathy-glib: Merge branch 'telepathy-glib-0.22', rejecting the changes

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 26 15:26:12 2013 +0100

Merge branch 'telepathy-glib-0.22', rejecting the changes

---