telepathy-mission-control: Merge branch 'deprecations'

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 96b49d683e449841ae4dc0a09aae6223db1a2a90
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=96b49d683e449841ae4dc0a09aae6223db1a2a90

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu May 10 15:07:37 2012 +0100

Merge branch 'deprecations'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24762
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24899
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24914
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49648
Reviewed-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

---