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
..
event-handler-service.js	…
event-stream-service.js	…
matrix-call.js	…
matrix-phone-service.js	…
matrix-service.js	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-09-03 18:25:17 +01:00
presence-service.js	…