From: Willy Tarreau <w@1wt.eu>
Date: Sun, 7 Jan 2007 01:16:59 +0000 (+0100)
Subject: Merge branch 'tcpsplice'
X-Git-Tag: v1.3.5~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=733fef4add17906606fb3282187e7369b0127c72;p=thirdparty%2Fhaproxy.git

Merge branch 'tcpsplice'
---

733fef4add17906606fb3282187e7369b0127c72