From: willy tarreau <willy@wtap.(none)>
Date: Sat, 15 Apr 2006 20:18:48 +0000 (+0200)
Subject: Merge branch 'haproxy-1.2.12'
X-Git-Tag: v1.2.12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4197319b4216067937391719d6e0dcd98d90833;p=thirdparty%2Fhaproxy.git

Merge branch 'haproxy-1.2.12'
---

a4197319b4216067937391719d6e0dcd98d90833