Mark Haines 9605593d11 Merge branch 'develop' into server2server_signing
Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py
2014-09-30 17:55:06 +01:00
..
2014-09-24 15:27:59 +01:00
2014-09-24 15:27:59 +01:00
2014-09-29 14:59:52 +01:00