Merge branch 'master' of https://github.com/example42/puppet-nginx
Merge branch 'master' of https://github.com/example42/puppet-nginx
Merge branch 'master' of https://github.com/example42/puppet-nginx
Revert template errors introduced in commit 4dd435e7e5b6f82bd776b7b07b1de62cbd1bdf11
Merge branch 'fix_bad_merge'
Merge pull request #47 from netmanagers/master

Fix errors introduced with merge 4dd435e7e5b6f82bd776b7b07b1de62cbd1bdf11