[next] telepathy-mission-control: Merge remote-tracking branch 'origin/ master' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Nov  5 13:23:49 2013 +0000

Merge remote-tracking branch 'origin/master' into next

Conflicts:
	configure.ac
	src/mcd-account-manager.c
	src/mcd-dispatcher.c
	src/mcd-storage.c
	tests/twisted/account-storage/default-keyring-storage.py
	tests/twisted/dispatcher/dispatch-obsolete.py

---