Merge branch 'maintenance' into devel

Conflicts:
	.versioneer-lookup

.versioneer-lookup

@@ -10,10 +10,10 @@
 # master shall not use the lookup table, only tags
 master
 
-# maintenance is currently the branch for preparation of maintenance release 1.2.2
+# maintenance is currently the branch for preparation of maintenance release 1.2.3
 # so are any fix/... branches
-maintenance 1.2.2 9f8d30a66c2fcc5cd0e8984c72dc36f7e84fde10 pep440-dev
-fix/.*      1.2.2 9f8d30a66c2fcc5cd0e8984c72dc36f7e84fde10 pep440-dev
+maintenance 1.2.3 1c6b0554c796f03ed539397daa4b13c44d05a99d pep440-dev
+fix/.*      1.2.3 1c6b0554c796f03ed539397daa4b13c44d05a99d pep440-dev
 
 # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now
 .*          1.3.0 198d3450d94be1a2                         pep440-dev

CHANGELOG.md

@@ -1,5 +1,13 @@
 # OctoPrint Changelog
 
+## 1.2.2 (2015-06-30)
+
+### Bug Fixes
+
+* Fixed an admin-only security issue introduced in 1.2.0, updating is strongly advised.
+
+([Commits](https://github.com/foosel/OctoPrint/compare/1.2.1...1.2.2))
+
 ## 1.2.1 (2015-06-30)
 
 ### Improvements
@@ -168,7 +176,7 @@
   changed under "Temperatures" in the Settings ([#343](https://github.com/foosel/OctoPrint/issues/343)).
 * High-DPI support for the GCode viewer ([#837](https://github.com/foosel/OctoPrint/issues/837)).
 * Stop websocket connections from multiplying ([#888](https://github.com/foosel/OctoPrint/pull/888)).
-* New setting to rotate webcam by 90° counter clockwise ([#895](https://github.com/foosel/OctoPrint/issues/895) and
+* New setting to rotate webcam by 90° counter clockwise ([#895](https://github.com/foosel/OctoPrint/issues/895) and
   [#906](https://github.com/foosel/OctoPrint/pull/906))
 * System commands now be set to a) run asynchronized by setting their `async` property to `true` and b) to ignore their
   result by setting their `ignore` property to `true`.