Merge branch 'minconn' into abort-close

author willy tarreau <willy@wtap.(none)>

Sun, 21 May 2006 19:11:03 +0000 (21:11 +0200)

committer willy tarreau <willy@wtap.(none)>

Sun, 21 May 2006 19:11:03 +0000 (21:11 +0200)
author willy tarreau <willy@wtap.(none)>
Sun, 21 May 2006 19:11:03 +0000 (21:11 +0200)
committer willy tarreau <willy@wtap.(none)>
Sun, 21 May 2006 19:11:03 +0000 (21:11 +0200)
diff --cc ROADMAP
Simple merge
diff --cc doc/haproxy-en.txt
Simple merge
author	willy tarreau <willy@wtap.(none)>
	Sun, 21 May 2006 19:11:03 +0000 (21:11 +0200)
committer	willy tarreau <willy@wtap.(none)>
	Sun, 21 May 2006 19:11:03 +0000 (21:11 +0200)
		1	2
ROADMAP	patch \|	diff1 \|	diff2 \|	blob \| history
doc/haproxy-en.txt	patch \|	diff1 \|	diff2 \|	blob \| history