telepathy-glib: Merge branch 'deprecation'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu May  3 13:06:17 2012 +0100

Merge branch 'deprecation'

Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49400

---