Merge branch 'develop' into markjh/v2_sync_receipts

Conflicts:
	synapse/handlers/sync.py

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/notifier.py b/synapse/notifier.py

index f998fc83bf..a78ee3c1e7 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -270,7 +270,7 @@ class Notifier(object):
 
     @defer.inlineCallbacks
     def wait_for_events(self, user, rooms, timeout, callback,
-                        from_token=StreamToken("s0", "0", "0", "0")):
+                        from_token=StreamToken("s0", "0", "0", "0", "0")):
         """Wait until the callback returns a non empty response or the
         timeout fires.
         """