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
Fix nginx config typo

Fixes the following error:

    $ sudo service nginx restart
    Restarting nginx: nginx: [emerg] invalid number of arguments in "types_hash_max_size" directive in /etc/nginx/nginx.conf:27
Merge pull request #40 from joshbetz/patch-1

Fix nginx config typo
Merge branch 'master' of https://github.com/example42/puppet-nginx
Add test to prevent breaking the main conf
Add all of Debian's config dirs to the main config file

Not adding them breaks upstreams configurations
Merge branch 'upstreams_conf_issue'
Merge pull request #42 from netmanagers/master

Fix Debian configuration
Merge branch 'master' oft merge upstream/master
Change to puppetlabs' concat.

Fix concat's paths
Merge branch 'concat'
Change dependency to puppetlabs' concat >=1.0.0
Merge pull request #43 from netmanagers/master

Fix bad path in previous commit and change to puppetlab's concat
Release v2.0.12
Merge branch 'master' of https://github.com/example42/puppet-nginx