Merge pull request #4706 from donvipre/nginx_1.12.1
authorThomas Heil <heil@terminal-consulting.de>
Wed, 16 Aug 2017 19:45:27 +0000 (21:45 +0200)
committerGitHub <noreply@github.com>
Wed, 16 Aug 2017 19:45:27 +0000 (21:45 +0200)
nginx: update to 1.12.1


Trivial merge