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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Jan 29 19:25:23 2014 +0000

Merge branch 'telepathy-mission-control-5.16'

Conflicts:
	NEWS

---