Erik Johnston 54d0a75573 Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging ... Conflicts: synapse/handlers/presence.py		2014-08-28 16:52:46 +01:00
..
__init__.py	…
async.py	…
distributor.py	…
jsonobject.py	…
lockutils.py	…
logutils.py	Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging	2014-08-28 16:52:46 +01:00
stringutils.py	…