kleine anpassungen
Merge branch 'ubuntu1204' of github.com:iterativ/deployit into ubuntu1204