| commit | ba0c0b16a14e353e1f5250738e7db9e9d979f85c | [log] [tgz] |
|---|---|---|
| author | Piotr Sikora <piotrsikora@google.com> | Wed Feb 24 14:44:01 2016 -0800 |
| committer | Piotr Sikora <piotrsikora@google.com> | Wed Feb 24 14:44:01 2016 -0800 |
| tree | c051228f30cc862540e2ee64468c9825c7a3606d | |
| parent | 06459b18f4ec1d77796220c19327223ed47f856f [diff] | |
| parent | a923267e3259b7f03550c41eef71d23534ef0a13 [diff] |
Merge branch 'nginx' (nginx-1.9.12). Change-Id: I554355b78a2bd766090179769a5fde494580090d Signed-off-by: Piotr Sikora <piotrsikora@google.com>