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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep  6 18:11:50 2012 +0100

Merge branch 'telepathy-mission-control-5.12'

Conflicts:
	NEWS
	configure.ac

---