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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Oct  4 13:05:23 2013 +0100

Merge branch 'master' into next

Conflicts:
	tests/twisted/constants.py

---