| commit | aa48b5a9c350fa3e464df959d9518fb3bc097399 | [log] [tgz] |
|---|---|---|
| author | Piotr Sikora <piotrsikora@google.com> | Fri Jul 08 16:44:56 2016 -0700 |
| committer | Piotr Sikora <piotrsikora@google.com> | Fri Jul 08 16:44:56 2016 -0700 |
| tree | 2323b1f1e0b820049ca3d656b0f440a42c4b580e | |
| parent | f7f177d338ef9bcfcfa858f3b2d493aae8308f03 [diff] | |
| parent | 7e635b228cf0d2a22d1cbfa5a6fff135899f0ecf [diff] |
Merge branch 'nginx' (nginx-1.11.2). Change-Id: Ib8c17f9ea6700842d4ca39aa32be90cf08f8be3f Signed-off-by: Piotr Sikora <piotrsikora@google.com>