just a change
Merge branch 'rspec-tests' of github.com:3flex/puppet-nginx into rspec-tests

Conflicts:
	spec/classes/nginx_spec.rb