]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
Merge branch 'haproxy-1.2.12' v1.2.12
authorwilly tarreau <willy@wtap.(none)>
Sat, 15 Apr 2006 20:18:48 +0000 (22:18 +0200)
committerwilly tarreau <willy@wtap.(none)>
Sat, 15 Apr 2006 20:18:48 +0000 (22:18 +0200)

Trivial merge