From 71e6a94af76dbaea592b66c2c065f19f9ef57cb0 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 17 Oct 2014 20:26:26 +0100
Subject: [PATCH] Bump version and changelog

---
 CHANGES.rst         | 13 ++++++++++---
 UPGRADE.rst         |  5 -----
 VERSION             |  2 +-
 synapse/__init__.py |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5b05900da..dab9285f3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,13 @@
-Changes in latest
-=================
-This breaks federation becuase of signing
+Changes in synpase 0.4.0 (2014-10-17)
+=====================================
+This server includes changes to the federation protocol that is not backwards
+compatible.
+
+The Matrix specification has been moved to a seperate git repository.
+
+Homeserver:
+ * Sign federation transactions.
+ * Rename timestamp keys in PDUs.
 
 Changes in synapse 0.3.4 (2014-09-25)
 =====================================
diff --git a/UPGRADE.rst b/UPGRADE.rst
index 2ae9254ec..713fb9ae8 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -1,8 +1,3 @@
-Upgrading to latest
-===================
-This breaks federation between old and new servers due to signing of
-transactions.
-
 Upgrading to v0.3.0
 ===================
 
diff --git a/VERSION b/VERSION
index 42045acae..1d0ba9ea1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.4
+0.4.0
diff --git a/synapse/__init__.py b/synapse/__init__.py
index a340a5db6..979eac08a 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.3.4"
+__version__ = "0.4.0"