bugfix
Merge branch 'master' of github.com:agabert/onitsuka3-puppet