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

3 files changed, 3 insertions, 3 deletions

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)