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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri May  3 12:28:30 2013 +0100

Merge branch 'telepathy-mission-control-5.14'

Conflicts:
	NEWS
	configure.ac

---