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

4 files changed, 30 insertions, 3 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index e1420d7a35..1ca2407a73 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,30 @@
+Changes in synapse v0.9.1 (2015-05-26)
+======================================
+
+General:
+
+* Add support for backfilling when a client paginates. This allows servers to
+  request history for a room from remote servers when a client tries to
+  paginate history the server does not have - SYN-36
+* Fix bug where you couldn't disable non-default pushrules - SYN-378
+* Fix ``register_new_user`` script - SYN-359
+* Improve performance of fetching events from the database, this improves both
+  initialSync and sending of events.
+* Improve performance of event streams, allowing synapse to handle more
+  simultaneous connected clients.
+
+Federation:
+
+* Fix bug with existing backfill implementation where it returned the wrong
+  selection of events in some circumstances.
+* Improve performance of joining remote rooms.
+
+Configuration:
+
+* Add support for changing the bind host of the metrics listener via the
+  ``metrics_bind_host`` option.
+ 
+
 Changes in synapse v0.9.0-r5 (2015-05-21)
 =========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 68f86138a4..4720d99848 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.9.0-r5"
+__version__ = "0.9.1"
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 4f47f88df8..078abfc56d 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -153,7 +153,7 @@ class Notifier(object):
 
             for x in self.room_to_user_streams.values():
                 all_user_streams |= x
-            for x in self.user_to_user_stream:
+            for x in self.user_to_user_stream.values():
                 all_user_streams.add(x)
             for x in self.appservice_to_user_streams.values():
                 all_user_streams |= x
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index 167b973b2b..8059fff1b2 100644
--- a/synapse/push/__init__.py
+++ b/synapse/push/__init__.py
@@ -76,7 +76,7 @@ class Pusher(object):
 
         rules = []
         for rawrule in rawrules:
-            rule = dict(rawrules)
+            rule = dict(rawrule)
             rule['conditions'] = json.loads(rawrule['conditions'])
             rule['actions'] = json.loads(rawrule['actions'])
             rules.append(rule)