Erik Johnston bb4a20174c Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
	synapse/federation/transport.py
	synapse/handlers/message.py
2014-10-27 10:20:44 +00:00
..
2014-09-29 15:35:54 +01:00
2014-09-24 15:27:59 +01:00
2014-09-30 12:38:38 +01:00
2014-09-25 15:51:21 +01:00