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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Oct  2 13:46:26 2013 +0100

Merge branch 'telepathy-mission-control-5.16'

Conflicts:
	tests/twisted/account-manager/avatar-refresh.py
	tests/twisted/constants.py
	tests/twisted/mctest.py

---