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

pull/22/head
Paul "LeoNerd" Evans 2014-12-02 18:01:32 +00:00
commit 3bf2b4bc92

Diff Content Not Available