Merge branch 'master' of github.com:matrix-org/synapse into develop

pull/1190/head
Erik Johnston 2016-11-01 16:48:53 +00:00
commit dc155f4c2c

Diff Content Not Available