[next] telepathy-mission-control: Merge branch 'telepathy-mission-control-5 .16'

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Oct  2 18:53:01 2013 +0100

Merge branch 'telepathy-mission-control-5.16'

Conflicts:
	NEWS
	configure.ac

---