From 39585bf5560e64bf6fca7d043cc3357b5dba59de Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 13 Jan 2015 09:57:32 +0000
Subject: [PATCH 1/2] Insert 'age' into top level when returning events to
 clients

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

diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index 4f4914467..4ad37188b 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -98,7 +98,7 @@ def serialize_event(hs, e):
     d = {k: v for k, v in e.get_dict().items()}
     if "age_ts" in d["unsigned"]:
         now = int(hs.get_clock().time_msec())
-        d["unsigned"]["age"] = now - d["unsigned"]["age_ts"]
+        d["age"] = now - d["unsigned"]["age_ts"]
         del d["unsigned"]["age_ts"]
 
     d["user_id"] = d.pop("sender", None)

From 1d3d37937d680e460d1931dd36f36bf59c606561 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 13 Jan 2015 09:59:47 +0000
Subject: [PATCH 2/2] Bump version

---
 VERSION             | 2 +-
 synapse/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 8b9dea59d..3b3e72317 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.1a
+0.6.1b
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 2195ad317..e7e27b06e 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.6.1a"
+__version__ = "0.6.1b"