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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Feb  3 16:38:31 2014 +0000

Merge branch 'telepathy-mission-control-5.16'

Conflicts:
	src/Makefile.am

---