From d3dd7490447bc3bd067ea34af8a69f157374c980 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Mon, 2 Feb 2015 13:17:45 +0000
Subject: [PATCH 1/2] Pin the version of Twisted to 14.0.2 since we are using
 some of its internals

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f0e9e7d26..bde26c0b9 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.

From d8cf06e525241252bcfac358d44f98d15dba9d0f Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Mon, 2 Feb 2015 13:18:36 +0000
Subject: [PATCH 2/2] Bump version to 0.6.1d

---
 VERSION             | 2 +-
 synapse/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 492b488cd..1c29ff4d3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.1c
+0.6.1d
diff --git a/synapse/__init__.py b/synapse/__init__.py
index fdfe5eda3..dacda8986 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"