From: Willy Tarreau <w@1wt.eu>
Date: Sun, 7 Jan 2007 12:49:41 +0000 (+0100)
Subject: Merge branch 'master' into http_parser
X-Git-Tag: v1.3.6~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cf932508d16b75d234d80d7b9f5a66cad00a353;p=thirdparty%2Fhaproxy.git

Merge branch 'master' into http_parser
---

6cf932508d16b75d234d80d7b9f5a66cad00a353