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

3 files changed, 9 insertions, 2 deletions

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

index 6779a36f72..477a404721 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes in synapse 0.5.3c (2014-12-02)
+======================================
+
+ * Change the default value for the `content_addr` option to use the HTTP
+   listener, as by default the HTTPS listener will be using a self-signed
+   certificate.
+
 Changes in synapse 0.5.3 (2014-11-27)
 =====================================
 
diff --git a/VERSION b/VERSION

index dc74c5626d..b6f145ad19 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.3a
+0.5.3c
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 658574dab9..0b43932305 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.5.3a"
+__version__ = "0.5.3c"