From 482a776a97cc3edaba688cd689a2782c3dec250a Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Fri, 14 Nov 2014 12:08:59 +0100
Subject: [PATCH 1/4] Added real rules for jshint.

---
 .hound.yml |  6 ------
 .jshint    | 26 +++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.hound.yml b/.hound.yml
index c69972d7..7a21dd80 100644
--- a/.hound.yml
+++ b/.hound.yml
@@ -1,9 +1,3 @@
 java_script:
   enabled: true
   config_file: .jshint
-
-LineLength:
-  Enabled: false
-
-StringLiterals:
-  Enabled: false
\ No newline at end of file
diff --git a/.jshint b/.jshint
index f7abd73d..17a9f28a 100644
--- a/.jshint
+++ b/.jshint
@@ -1,8 +1,28 @@
 {
-	"smarttabs": true,
-	"onecase": true,
+	"asi": true,
+	"bitwise": false,
+	"browser": true,
+	"camelcase": false, // Disabled for now.
 	"curly": true,
 	"forin": true,
+	"immed": true,
+	"latedef": true,
+	"maxlen": 1000,
+	"newcap": true,
+	"noarg": true,
+	"noempty": false, // Disabled for now.
+	"nonew": true,
+	"onecase": true,
+	"predef": [
+		"define",
+		"require",
+		"console"
+	],
+	"quotmark": false,
+	"smarttabs": true,
 	"trailing": true,
-	"asi": true
+	"undef": true,
+	"unused": false // Disabled for now
 }
+
+

From b03ccff479b7739940666bfec4383336c24dbc93 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Fri, 14 Nov 2014 12:30:25 +0100
Subject: [PATCH 2/4] Allow more JavaScript for now.

---
 .jshint | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/.jshint b/.jshint
index 17a9f28a..cd8005e6 100644
--- a/.jshint
+++ b/.jshint
@@ -1,28 +1,10 @@
 {
-	"asi": true,
-	"bitwise": false,
-	"browser": true,
-	"camelcase": false, // Disabled for now.
+	"smarttabs": true,
+	"onecase": true,
 	"curly": true,
 	"forin": true,
-	"immed": true,
-	"latedef": true,
-	"maxlen": 1000,
-	"newcap": true,
-	"noarg": true,
-	"noempty": false, // Disabled for now.
-	"nonew": true,
-	"onecase": true,
-	"predef": [
-		"define",
-		"require",
-		"console"
-	],
-	"quotmark": false,
-	"smarttabs": true,
 	"trailing": true,
-	"undef": true,
-	"unused": false // Disabled for now
-}
-
-
+	"asi": true,
+	"maxlen": 1000,
+	"quotmark": false
+}
\ No newline at end of file

From 00c12051e6abcc5854413e64300c90f20ce7e556 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Wed, 11 Feb 2015 11:19:26 +0100
Subject: [PATCH 3/4] 0.23.5

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 528811c2..222a7823 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spreed-webrtc-server (0.23.5) precise; urgency=low
+
+  * No longer install config file in install target of Makefile. We leave it to the packaging.
+  * Sessions are no longer cleaned up when another connection replaced the session and a stale connection gets disconnected after that.
+
+ -- Simon Eisenmann <simon@struktur.de>  Wed, 11 Feb 2015 11:16:47 +0100
+
 spreed-webrtc-server (0.23.4) precise; urgency=low
 
   * Cleanup of README.

From e1af7b6e1faed0067f16dcaef01ee8972539bc98 Mon Sep 17 00:00:00 2001
From: Evan Theurer <theurer@struktur.de>
Date: Mon, 16 Feb 2015 09:52:36 +0100
Subject: [PATCH 4/4] Update travis npm install.

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 82242031..90ebc9a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,7 @@ install:
   - sudo apt-get -y install nodejs rubygems python-babel
   - sudo gem install oj
   - sudo gem install compass
-  - npm install -g po2json
-  - npm install -g autoprefixer
+  - npm install
 
 script:
   - ./autogen.sh