| commit | c36c36468b11fd1c1eff614c8af3fde4c6eaa668 | |
| author | Kirill A. Korinskiy <catap@catap.ru> | |
| Tue, 28 Jul 2009 13:30:00 +0000 (28 17:30 +0400) | ||
| committer | Kirill A. Korinskiy <catap@catap.ru> | |
| Tue, 28 Jul 2009 13:30:00 +0000 (28 17:30 +0400) | ||
| tree | e83cd1d217be06b532839287cf41bf4766842f02 | treesnapshot (tar.gz zip) |
| parent | 8e79d50ef00ba7012da01c515cbfd1bb65ea3f5b | commitdiff |
| parent | e76241c4ac7f1e1745670f623fc8fb83b3f3ad27 | commitdiff |
Merge commit 'v0.8.7'
Conflicts:
CHANGES
CHANGES.ru
src/core/nginx.h
src/http/modules/ngx_http_ssi_filter_module.c
src/http/modules/perl/nginx.pm
Conflicts:
CHANGES
CHANGES.ru
src/core/nginx.h
src/http/modules/ngx_http_ssi_filter_module.c
src/http/modules/perl/nginx.pm
12 files changed: