From 712617b4b2f0a7be177efa788969f26f2437da07 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 21 Jul 2015 09:50:55 +0100
Subject: [PATCH] Bump change log and version to v0.9.4-rc1

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 6a5fce899a..0337bac107 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,23 @@
+Changes in synapse v0.9.4-rc1 (2015-07-21)
+==========================================
+
+General:
+
+* Add basic implementation of receipts.
+* Add support for configuration presets in room creation API.
+* Add auth event that limits the visibility of history for new users.
+* Add SAML2 login/registration support.
+* Add Content-Disposition headers to content repository responses.
+* Change power level semantics so that you cannot kick, ban or change power
+  levels of users that have equal or greater power level than you.
+* Bulk insert events where appropriate.
+* Bulk verify signatures where appropriate.
+
+
+Configuration:
+
+* Add support for including TLS certifcate chains.
+
 Changes in synapse v0.9.3 (2015-07-01)
 ======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 96e37308d6..40c535d6f0 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.3"
+__version__ = "0.9.4-rc1"