From 25b32b63aee6cc2feb4ffdd4c247475f63a241dc Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 27 Aug 2015 10:09:32 +0100
Subject: [PATCH] Bump changelog and version

---
 CHANGES.rst         | 13 ++++++++++---
 synapse/__init__.py |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5f16e4485..22921668e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,19 +1,26 @@
+Changes in synapse v0.10.0-rc4 (2015-08-27)
+===========================================
+
+* Allow UTF-8 filenames for upload. (PR #259)
+
 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``.
+  or ``--generate-keys``. (PR #250)
 * Allow ``--config-path`` to specify a directory, causing synapse to use all
-  \*.yaml files in the directory as config files.
+  \*.yaml files in the directory as config files. (PR #249)
 * Add ``web_client_location`` config option to specify static files to be
-  hosted by synapse under ``/_matrix/client``.
+  hosted by synapse under ``/_matrix/client``. (PR #245)
 * 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
 
+  (PR #246)
+
 
 Changes in synapse v0.10.0-rc2 (2015-08-24)
 ===========================================
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 41e3283f0..635f53af1 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-rc3"
+__version__ = "0.10.0-rc4"