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	…
base.py	…
directory.py	…
events.py	…
initial_sync.py	…
login.py	…
presence.py	…
profile.py	…
register.py	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-09-03 18:25:17 +01:00
room.py	…
transactions.py	…