From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 14 Jan 2012 07:42:56 +0000 (-0700)
Subject: merged fron trunk
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fac593c3a819c6a88b53d8973eceb47361b4fd75;p=thirdparty%2Fsquid.git

merged fron trunk
---

fac593c3a819c6a88b53d8973eceb47361b4fd75