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

CHANGES.rst

+Changes in synapse v0.22.1 (2017-07-06)
+=======================================
+
+Bug fixes:
+
+* Fix bug where pusher pool didn't start and caused issues when
+  interacting with some rooms (PR #2342)
+
+
 Changes in synapse v0.22.0 (2017-07-06)
 =======================================
 

synapse/__init__.py

@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.22.0"
+__version__ = "0.22.1"