| commit | 4add18df3dc36092eb766b492499de00835d4c7f | [log] [tgz] |
|---|---|---|
| author | Piotr Sikora <piotrsikora@google.com> | Tue Dec 08 17:21:49 2015 -0800 |
| committer | Piotr Sikora <piotrsikora@google.com> | Tue Dec 08 17:21:49 2015 -0800 |
| tree | b0724a69b39881da1cf7f881c9e7033754da3e39 | |
| parent | 0a8aea31e9264e33fd9dd28c193b307a663bda13 [diff] | |
| parent | 5dbb87cc4347e2abd66d955d89e018f165d7a05f [diff] |
Merge branch 'nginx' (nginx-1.9.8). Change-Id: I404d3798c3e830f79e50f5743cffa7260987448c Signed-off-by: Piotr Sikora <piotrsikora@google.com>