| commit | 52dc8e5a09ec6970bb9301a0288ba80de820ef00 | |
| author | Kirill A. Korinskiy <catap@catap.ru> | |
| Wed, 16 Jun 2010 06:32:23 +0000 (16 10:32 +0400) | ||
| committer | Kirill A. Korinskiy <catap@catap.ru> | |
| Wed, 16 Jun 2010 06:32:55 +0000 (16 10:32 +0400) | ||
| tree | 9e6cd2affd0f0057c811bce1914d41fbba39a208 | treesnapshot (tar.gz zip) |
| parent | 0c1c549d618b681449747007812e6c58ee209ad5 | commitdiff |
| parent | 3d1a9e0c0599c21dc55778d9cc80b9c67677565c | commitdiff |
Merge branch 'ngx_http_upstream_keepalive_module'
Conflicts:
auto/modules
auto/options
Conflicts:
auto/modules
auto/options
| auto/modules | diff1 | diff2 | blobhistory |
| auto/options | diff1 | diff2 | blobhistory |
| auto/sources | diff1 | diff2 | blobhistory |