Kegan Dougal f9232c7917 Merge branch 'develop' into application-services-txn-reliability ... Conflicts: synapse/storage/appservice.py		2015-03-16 10:09:15 +00:00
..
__init__.py	…
test_appservice.py	…
test_directory.py	…
test_federation.py	…
test_presence.py	…
test_presencelike.py	…
test_profile.py	…
test_room.py	…
test_typing.py	…