From cc77507368336f7e45dfbd9ea7c2e793a1e8bb6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 18 Jun 2013 21:41:12 +0200
Subject: [PATCH 1/2] Updated module versions (cherry picked from commit
 e90c1d9)

---
 requirements-bbb.txt | 10 +++++-----
 requirements.txt     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/requirements-bbb.txt b/requirements-bbb.txt
index 806ca23f..6bf2a2dd 100644
--- a/requirements-bbb.txt
+++ b/requirements-bbb.txt
@@ -1,7 +1,7 @@
 flask==0.9
 werkzeug==0.8.3
-tornado>=2.4.1
-tornadio2>=0.0.4
-PyYAML>=3.10
-Flask-Login>=0.1.3
-Flask-Principal>=0.3.5
\ No newline at end of file
+tornado==3.0.2
+tornadio2==0.0.4
+PyYAML==3.10
+Flask-Login==0.2.2
+Flask-Principal==0.3.5
diff --git a/requirements.txt b/requirements.txt
index a2176761..7c644b5e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 flask==0.9
 werkzeug==0.8.3
+tornado==3.0.2
+tornadio2==0.0.4
+PyYAML==3.10
+Flask-Login==0.2.2
+Flask-Principal==0.3.5
 numpy>=1.6.2
 pyserial>=2.6
-tornado>=2.4.1
-tornadio2>=0.0.4
-PyYAML>=3.10
-Flask-Login>=0.1.3
-Flask-Principal>=0.3.5
\ No newline at end of file

From c24a66c3611538bba21279bd036ee9acfa797101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 19 Jun 2013 20:36:50 +0200
Subject: [PATCH 2/2] Fixed signature for user view model. Closes #157

---
 octoprint/static/js/ui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js
index 8ade8a1e..43809c3a 100644
--- a/octoprint/static/js/ui.js
+++ b/octoprint/static/js/ui.js
@@ -1135,6 +1135,7 @@ function UsersViewModel(loginStateViewModel) {
         {},
         "name",
         [],
+        [],
         CONFIG_USERSPERPAGE
     );