Public Git Hosting - nginx-catap.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 460466e 9af8103)

commit	d50609c8f4f84197abeaaaccda9661bcf896a0b3
author	Kirill A. Korinskiy <catap@catap.ru>
	Fri, 17 Jul 2009 13:57:31 +0000 (17 17:57 +0400)
committer	Kirill A. Korinskiy <catap@catap.ru>
	Fri, 17 Jul 2009 13:57:31 +0000 (17 17:57 +0400)
tree	58632c4e54660c38ed8b533234af36719543e9de	tree \| snapshot (tar.gz zip)
parent	460466ea2be8ecc4eb1e66525280e79a7d9d3d47	commit \| diff
parent	9af8103d6dfeb6b6ffb78097e057bd36d4f84b7c	commit \| diff

Merge commit 'v0.8.5'

Conflicts:
CHANGES
CHANGES.ru
src/core/nginx.h
src/http/modules/perl/nginx.pm

CHANGES	diff1 \|	diff2 \|	blob \| history
CHANGES.ru	diff1 \|	diff2 \|	blob \| history
src/core/nginx.h	diff1 \|	diff2 \|	blob \| history
src/http/modules/perl/nginx.pm	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_request.c	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_upstream.c	diff1 \|	diff2 \|	blob \| history

catap's nginx repository