Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse
Bump version, changelog and upgrade.rst
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0
Merge branch 'release-v0.5.0' of github.com:matrix-org/synapse
Add note about rerunning setup.py develop
typoe
Merge branch 'master' into develop