| commit | b5aa4005e0661fc38265f7d9bb4e69f84d7fb15f | [log] [tgz] |
|---|---|---|
| author | Piotr Sikora <piotrsikora@google.com> | Tue Apr 19 15:58:44 2016 -0700 |
| committer | Piotr Sikora <piotrsikora@google.com> | Tue Apr 19 15:58:44 2016 -0700 |
| tree | 6030407d1e807a95ef0a03dffeffdd2ffa3e1f91 | |
| parent | f441159267579f3971281bd5f13e742e91b583ce [diff] | |
| parent | b604557c694c99e8a4e3c5d177b05f0ecdf22a22 [diff] |
Merge branch 'nginx' (nginx-1.9.15). Change-Id: I3912801f1a80ff1cbdd9b233a62c6e9b2c782182 Signed-off-by: Piotr Sikora <piotrsikora@google.com>