From 2c8699506d3c1a46a9fd1afae8ec1dcb69811905 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 15 Apr 2013 12:21:10 +0100
Subject: [PATCH] push express back as it breaks sessions

---
 CHANGELOG.md     | 2 ++
 src/package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fa1d7768..513a93b79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,10 @@
  * Fix: Import browser detection
  * Fix: 2 Part Locale Specs
  * Fix: Remove language string from chat element
+ * Fix: Temporary patch for Changeset Spam
  * Fix: Make Saved revision Star fade back out on non Top frames
  * Other: Remove some cruft legacy JS from old Etherpad
+ * Other: Express 3.1.2 breaks sessions, set Express to 3.1.0
 
 # 1.2.91
  * NEW: Authors can now send custom object messages to other Authors making 3 way conversations possible.  This introduces WebRTC plugin support.
diff --git a/src/package.json b/src/package.json
index 0b551faf5..e7c56549f 100644
--- a/src/package.json
+++ b/src/package.json
@@ -18,7 +18,7 @@
                       "socket.io"               : "0.9.x",
                       "ueberDB"                 : "0.2.x",
                       "async"                   : "0.1.x",
-                      "express"                 : "3.x",
+                      "express"                 : "3.1.0",
                       "connect"                 : "2.4.x",
                       "clean-css"               : "0.3.2",
                       "uglify-js"               : "1.2.5",