Merge branch 'master' of github.com:josefprusa/Prusa3
authorJoachim Glauche <webmaster@joaz.de>
Thu, 9 Aug 2012 10:15:09 +0000 (12:15 +0200)
committerJoachim Glauche <webmaster@joaz.de>
Thu, 9 Aug 2012 10:15:09 +0000 (12:15 +0200)

Trivial merge