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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr 30 13:11:37 2013 +0100

Merge branch 'telepathy-mission-control-5.14'

Conflicts:
	NEWS

---