editinit
Merge branch 'master' of https://github.com/broekhuizen/puppet-base into editinit

edit
add test 2
Merge pull request #2 from broekhuizen/editinit

Editinit