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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Sep 20 17:47:23 2013 +0100

Merge branch 'telepathy-mission-control-5.16' into master

Conflicts:
	mission-control-plugins/dispatch-operation.c

---