From ce14c7a9954ebfa80831efc0901ca04d8cfe6ab5 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 11 Feb 2016 15:02:56 +0000
Subject: [PATCH 1/2] Fix SYN-627, events are in incorrect room in /sync

---
 synapse/storage/stream.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 0d1034c6f..c236dafaf 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -175,7 +175,7 @@ class StreamStore(SQLBaseStore):
                 preserve_fn(self.get_room_events_stream_for_room)(
                     room_id, from_key, to_key, limit, order=order,
                 )
-                for room_id in room_ids
+                for room_id in rm_ids
             ])
             results.update(dict(zip(rm_ids, res)))
 

From 2a24f906a9a7e29e0744ad89cb2de5328c5f3987 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 11 Feb 2016 16:03:47 +0000
Subject: [PATCH 2/2] Bump version and changelog

---
 CHANGES.rst         | 5 +++++
 synapse/__init__.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index ac7dcdca2..bebf489e2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+Changes in synapse v0.13.3 (2016-02-11)
+=======================================
+
+* Fix bug where ``/sync`` would occasionally return events in the wrong room.
+
 Changes in synapse v0.13.2 (2016-02-11)
 =======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 9c4213a4a..bc50bec9d 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.13.2"
+__version__ = "0.13.3"