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

pull/324/head
Erik Johnston 2015-10-22 13:17:14 +01:00
commit 1fc2d11a14

Diff Content Not Available