Merge branch 'master' of github.com:matrix-org/synapse into develop

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGES.rst b/CHANGES.rst

index 2ec10516fd..a0a12ca4a0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+Changes in synapse v0.10.0-r1 (2015-09-08)
+==========================================
+
+* Fix bug with python packaging
+
 Changes in synapse v0.10.0 (2015-09-03)
 =======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py

index d85bb3dce0..5b5ff6c3f3 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"
+__version__ = "0.10.0-r1"