Merge branch 'master' of github.com:josefprusa/Prusa3
authorVáclav 'Ax' Hůla <axtheb@gmail.com>
Sun, 16 Jun 2013 14:10:39 +0000 (16:10 +0200)
committerVáclav 'Ax' Hůla <axtheb@gmail.com>
Sun, 16 Jun 2013 14:10:39 +0000 (16:10 +0200)

Trivial merge