[next] telepathy-mission-control: Merge branch 'telepathy-mission-control-5 .16'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 19 15:22:40 2013 +0100

Merge branch 'telepathy-mission-control-5.16'

---