Merge pull request #5111 from wigyori/for-15.05-nginx
authorThomas Heil <heil@terminal-consulting.de>
Mon, 13 Nov 2017 09:28:25 +0000 (10:28 +0100)
committerGitHub <noreply@github.com>
Mon, 13 Nov 2017 09:28:25 +0000 (10:28 +0100)
CC: nginx: upgrade to 1.12.1

Trivial merge