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
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
Ensure was not being properly used in resource::location
Modify resource::vhost and resource::location to manage different distros
Wrong var name
Lint
More lint
Typo
Merge pull request #34 from netmanagers/master

Modify nginx::resource::* to manage different distros