From 15844040c236fd3b7199286533239051c9a9b7ea Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 23 Mar 2016 16:57:41 +0000
Subject: [PATCH] Bump version and changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 45d9cf30b2..a85c8d69f8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,24 @@
+Changes in synapse v0.14.0-rc2 (2016-03-23)
+===========================================
+
+Features:
+
+* Add published room list API (PR #657)
+
+Changes:
+
+* Change various caches to consume less memory (PR #656, #658, #660, #662,
+  #663, #665)
+* Allow rooms to be published without requiring an alias (PR #664)
+* Intern common strings in caches to reduce memory footprint (#666)
+
+Bug fixes:
+
+* Fix reject invites over federation (PR #646)
+* Fix bug where registration was not idempotent (PR #649)
+* Update aliases event after deleting aliases (PR #652)
+* Fix unread notification count, which was sometimes wrong (PR #661)
+
 Changes in synapse v0.14.0-rc1 (2016-03-14)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 67fbc3a33a..60a7e8d69c 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.14.0-rc1"
+__version__ = "0.14.0-rc2"