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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Aug  8 10:36:49 2012 +0100

Merge branch 'telepathy-mission-control-5.12'

Conflicts:
	NEWS
	configure.ac

---