David Baker 6532b6e607 Merge branch 'develop' into csauth ... Conflicts: synapse/http/server.py		2015-04-24 09:37:54 +01:00
..
__init__.py	…
client.py	…
endpoint.py	…
matrixfederationclient.py	…
server.py	Merge branch 'develop' into csauth	2015-04-24 09:37:54 +01:00
servlet.py	…