Fix errors introduced with merge 4dd435e7e5b6f82bd776b7b07b1de62cbd1bdf11#47

Merged

alvagante merged 5 commits intomasterfrom

master

Nov 26, 2013

Commits on Oct 27, 2013

Merge branch 'master' of https://github.com/example42/puppet-nginx
javierbertoli
committed

Commits on Oct 31, 2013

Merge branch 'master' of https://github.com/example42/puppet-nginx
javierbertoli
committed

Commits on Nov 24, 2013

Merge branch 'master' of https://github.com/example42/puppet-nginx
javierbertoli
committed

Commits on Nov 26, 2013