Mark Haines e903c941cb Merge branch 'develop' into request_logging ... Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py		2014-11-14 11:16:50 +00:00
..
__init__.py	…
context_factory.py	…
event_signing.py	…
keyclient.py	…
keyring.py	…