Merge branch 'master' of github.com:josefprusa/Prusa3 into new-bushing
authorVáclav 'Ax' Hůla <axtheb@gmail.com>
Thu, 24 Jan 2013 13:36:20 +0000 (14:36 +0100)
committerVáclav 'Ax' Hůla <axtheb@gmail.com>
Thu, 24 Jan 2013 13:36:20 +0000 (14:36 +0100)

Trivial merge