From 37730616c1acfb6620741e1fb684a385518a0c7f Mon Sep 17 00:00:00 2001
From: Andres <torti.max@gmail.com>
Date: Sun, 20 Sep 2015 22:44:49 +0200
Subject: [PATCH 1/3] Fixed wrong urls (cherry picked from commit 119f3ba)

---
 docs/api/job.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/api/job.rst b/docs/api/job.rst
index 3bcc1fde..eeb3b071 100644
--- a/docs/api/job.rst
+++ b/docs/api/job.rst
@@ -37,7 +37,7 @@ Issue a job command
 
    .. sourcecode:: http
 
-      POST /api/control/job HTTP/1.1
+      POST /api/job HTTP/1.1
       Host: example.com
       Content-Type: application/json
       X-Api-Key: abcdef...
@@ -54,7 +54,7 @@ Issue a job command
 
    .. sourcecode:: http
 
-      POST /api/control/job HTTP/1.1
+      POST /api/job HTTP/1.1
       Host: example.com
       Content-Type: application/json
       X-Api-Key: abcdef...
@@ -71,7 +71,7 @@ Issue a job command
 
    .. sourcecode:: http
 
-      POST /api/control/job HTTP/1.1
+      POST /api/job HTTP/1.1
       Host: example.com
       Content-Type: application/json
       X-Api-Key: abcdef...
@@ -88,7 +88,7 @@ Issue a job command
 
    .. sourcecode:: http
 
-      POST /api/control/job HTTP/1.1
+      POST /api/job HTTP/1.1
       Host: example.com
       Content-Type: application/json
       X-Api-Key: abcdef...

From 65efcec0081c2d258bc95dc400f36cad085beadd Mon Sep 17 00:00:00 2001
From: Kevin Murphy <murphyk3@wit.edu>
Date: Fri, 30 Oct 2015 11:18:44 -0400
Subject: [PATCH 2/3] Change instance of row to row-fluid to avoid conflict
 with responsive CSS

---
 src/octoprint/templates/tabs/temperature.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/octoprint/templates/tabs/temperature.jinja2 b/src/octoprint/templates/tabs/temperature.jinja2
index 90622dcd..10344342 100644
--- a/src/octoprint/templates/tabs/temperature.jinja2
+++ b/src/octoprint/templates/tabs/temperature.jinja2
@@ -1,5 +1,5 @@
 {% if enableTemperatureGraph %}
-    <div class="row" style="padding-left: 20px">
+    <div class="row-fluid">
         <div id="temperature-graph"></div>
     </div>
 {% endif %}

From a44eb43f0f37fdd28d8119377f99ed25bd9b835e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Fri, 30 Oct 2015 16:53:17 +0100
Subject: [PATCH 3/3] Added @kevingelion to AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 0309fdf5..3cd1754d 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -53,6 +53,7 @@ date of first contribution):
   * [Andrew Erickson](https://github.com/aerickson)
   * [Nicanor Romero Venier](https://github.com/nicanor-romero)
   * [Thomas Hou](https://github.com/masterhou)
+  * [Kevin Murphy](https://github.com/kevingelion)
 
 OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by
 [Daid Braam](https://github.com/daid). Parts of its communication layer and