From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 10 Oct 2014 08:10:58 +0000 (-0700)
Subject: Merge from trunk rev.13638
X-Git-Tag: merge-candidate-3-v1~506^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3637c7dfe6c370b1459a0a444ed5036dce9ec274;p=thirdparty%2Fsquid.git

Merge from trunk rev.13638
---

3637c7dfe6c370b1459a0a444ed5036dce9ec274