From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 6 May 2014 17:06:24 +0000 (-0700)
Subject: Merge fron trunk rev.13398
X-Git-Tag: merge-candidate-3-v1~506^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36104f294b96037f7ee7674fa3448314b409eafe;p=thirdparty%2Fsquid.git

Merge fron trunk rev.13398
---

36104f294b96037f7ee7674fa3448314b409eafe