From 90fde4b8d7f2f74822df1008dadb4c31c2cde56c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 25 Aug 2015 17:49:58 +0100
Subject: [PATCH] Bump changelog and version

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

diff --git a/CHANGES.rst b/CHANGES.rst
index f4946c6df..5f16e4485 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,20 @@
+Changes in synapse v0.10.0-rc3 (2015-08-25)
+===========================================
+
+* Add ``--keys-directory`` config option to specify where files such as
+  certs and signing keys should be stored in, when using ``--generate-config``
+  or ``--generate-keys``.
+* Allow ``--config-path`` to specify a directory, causing synapse to use all
+  \*.yaml files in the directory as config files.
+* Add ``web_client_location`` config option to specify static files to be
+  hosted by synapse under ``/_matrix/client``.
+* Add helper utility to synapse to read and parse the config files and extract
+  the value of a given key. For example::
+
+    $ python -m synapse.config read server_name -c homeserver.yaml
+    localhost
+
+
 Changes in synapse v0.10.0-rc2 (2015-08-24)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index b4eab89d4..41e3283f0 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.10.0-rc2"
+__version__ = "0.10.0-rc3"