From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 21 Jul 2015 13:56:20 +0000 (-0700)
Subject: Merged from trunk rev.14169
X-Git-Tag: merge-candidate-3-v1~32^2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e08f749666bdd996e16da7a043fd66b0c8a816eb;p=thirdparty%2Fsquid.git

Merged from trunk rev.14169
---

e08f749666bdd996e16da7a043fd66b0c8a816eb