telepathy-glib: Merge branch 'telepathy-glib-0.22' (early part) into HEAD

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Oct  2 14:52:58 2013 +0100

Merge branch 'telepathy-glib-0.22' (early part) into HEAD

---