]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
Merge branch 'pools' into merge-pools
authorWilly Tarreau <w@1wt.eu>
Mon, 14 May 2007 00:11:56 +0000 (02:11 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 14 May 2007 00:11:56 +0000 (02:11 +0200)
1  2 
src/task.c

diff --cc src/task.c
Simple merge