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 5bea8e82d5..d01eca4004 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+Changes in synapse v0.11.0-r2 (2015-11-19)
+==========================================
+
+* Fix bug in database port script (PR #387)
+
 Changes in synapse v0.11.0-r1 (2015-11-18)
 ==========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 5a83f5f3ec..7ff37edf2c 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.11.0-r1"
+__version__ = "0.11.0-r2"