nginx 1.5.12
Merge pull request #82 from ntwb/master

nginx 1.5.12