Merge branch 'master' of github.com:josefprusa/Prusa3
authorVáclav 'Ax' Hůla <axtheb@gmail.com>
Tue, 23 Apr 2013 22:24:37 +0000 (00:24 +0200)
committerVáclav 'Ax' Hůla <axtheb@gmail.com>
Tue, 23 Apr 2013 22:24:37 +0000 (00:24 +0200)

Trivial merge