Mark Haines 984e207b59 Merge branch develop into server2server_signing ... Conflicts: synapse/app/homeserver.py		2014-10-13 10:58:50 +01:00
..
__init__.py	…
homeserver.py	Merge branch develop into server2server_signing	2014-10-13 10:58:50 +01:00