]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
Merge branch 'master' of home:/data/git/public/haproxy-1.3
authorWilly Tarreau <w@1wt.eu>
Fri, 22 Dec 2006 13:41:19 +0000 (14:41 +0100)
committerWilly Tarreau <w@1wt.eu>
Fri, 22 Dec 2006 13:41:19 +0000 (14:41 +0100)

Trivial merge