telepathy-mission-control: Merge branch 'telepathy-mission-control-5.12'

[Xavier Claessens]

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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Wed Jul 11 12:15:52 2012 +0200

Merge branch 'telepathy-mission-control-5.12'

---