Erik Johnston c86ebe7673 Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Conflicts:
	synapse/app/homeserver.py
	synapse/state.py
2015-02-10 11:04:37 +00:00
..
2015-01-06 13:21:39 +00:00
2015-01-06 13:21:39 +00:00