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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed May  1 20:00:20 2013 +0100

Merge branch 'telepathy-mission-control-5.14'

Conflicts:
	NEWS

---