Merge pull request #45 from matrix-org/hotfixes-v0.6.1d v0.6.1d

Hotfixes v0.6.1d

3 files changed, 4 insertions, 3 deletions

diff --git a/VERSION b/VERSION

index 492b488cd8..1c29ff4d36 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.1c
+0.6.1d
diff --git a/setup.py b/setup.py

index f0e9e7d264..bde26c0b97 100755
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ setup(
     install_requires=[
         "syutil==0.0.2",
         "matrix_angular_sdk>=0.6.1",
-        "Twisted>=14.0.0",
+        "Twisted==14.0.2",
         "service_identity>=1.0.0",
         "pyopenssl>=0.14",
         "pyyaml",
@@ -50,6 +50,7 @@ setup(
         "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.6.1/#egg=matrix_angular_sdk-0.6.1",
     ],
     setup_requires=[
+        "Twisted==14.0.2",
         "setuptools_trial",
         "setuptools>=1.0.0", # Needs setuptools that supports git+ssh.
                              # TODO: Do we need this now? we don't use git+ssh.
diff --git a/synapse/__init__.py b/synapse/__init__.py

index fdfe5eda3e..dacda89865 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.6.1c"
+__version__ = "0.6.1d"