telepathy-mission-control: Merge branch 'telepathy-mission-control-5.12', rejecting stable-only changes

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Aug 27 11:50:59 2012 +0100

Merge branch 'telepathy-mission-control-5.12', rejecting stable-only changes

---