Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse

CHANGES.rst

README.rst

VERSION

contrib/jitsimeetbridge/jitsimeetbridge.py

contrib/jitsimeetbridge/syweb-jitsi-conference.patch

contrib/jitsimeetbridge/unjingle/strophe.jingle.sdp.js

contrib/jitsimeetbridge/unjingle/strophe.jingle.sdp.util.js

contrib/jitsimeetbridge/unjingle/strophe/XMLHttpRequest.js

contrib/jitsimeetbridge/unjingle/strophe/base64.js

contrib/jitsimeetbridge/unjingle/strophe/md5.js

contrib/jitsimeetbridge/unjingle/strophe/strophe.js

contrib/jitsimeetbridge/unjingle/unjingle.js

contrib/vertobot/.gitignore

contrib/vertobot/bot.pl

contrib/vertobot/config.yaml

contrib/vertobot/cpanfile

contrib/vertobot/verto-example.json

synapse/__init__.py

synapse/config/logger.py

synapse/federation/replication.py