Update nginx to 1.6.0
Merge pull request #608 from pyhalov/nginx

Update nginx to 1.6.0