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

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu Sep  6 11:19:21 2012 +0200

Merge branch 'telepathy-mission-control-5.12'

---