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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Jan 13 13:29:14 2014 +0000

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

Conflicts:
	src/connectivity-monitor.c
	src/mcd-connection.c
	tests/twisted/account-storage/libaccounts-sso-storage.py

---