David Baker d72ce4da64 Merge branch 'develop' of github.com:matrix-org/synapse into develop ... Conflicts: synapse/http/client.py		2014-09-03 18:25:17 +01:00
..
__init__.py	…
client.py	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-09-03 18:25:17 +01:00
content_repository.py	…
endpoint.py	…
server.py	…