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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 20 15:07:13 2012 +0100

Merge branch 'telepathy-mission-control-5.12' into master

Conflicts:
	NEWS
	configure.ac

---