Merge branch 'master' of github.com:josefprusa/Prusa3
authorVáclav 'Ax' Hůla <axtheb@gmail.com>
Wed, 5 Jun 2013 22:31:28 +0000 (00:31 +0200)
committerVáclav 'Ax' Hůla <axtheb@gmail.com>
Wed, 5 Jun 2013 22:31:28 +0000 (00:31 +0200)

Trivial merge