tree d6cc4cddcc4f02e1695aad6806eb97f9bdc02d86
parent 43a6555f186000abe2b5cad39afb4dc44f9bf532
parent 45fd5e32ea793fda06aa1de85c5ed8ca3b3020ed
author Piotr Sikora <piotrsikora@google.com> 1490232332 -0700
committer Piotr Sikora <piotrsikora@google.com> 1490232332 -0700

Merge branch 'nginx' (nginx-1.11.11).

Change-Id: I565537a83127ce2106cd829a8f7c0e2f961f3ccf
Signed-off-by: Piotr Sikora <piotrsikora@google.com>