Fixed location containing '\', such as '~ \.php$'
Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Merge pull request #210 from abraham1901/dev

Bugfix: Fixed location containing '\', such as '~ \.php$'
Fixed the ability to disable the index_files
Merge pull request #211 from abraham1901/dev

Fixed the ability to disable the index_files
Implementation for the ssl_stapling_* parameters.
Implementation of the resolver parameter.
Fix warning: Variable access via 'index_files' is deprecated. Use '@index_files' instead.
Merge pull request #213 from hdanes/ssl_stapling

Added support for SSL stapling of OCSP responses.
Merge pull request #214 from hdanes/master

Fix warning: Variable access via 'index_files' is deprecated.
Merge commit '96475098ebd4fba7dd951efcee1c6ee38b2935a9' into ssl_dhparam

Conflicts:
	manifests/resource/vhost.pp