From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 1 Jun 2015 06:21:54 +0000 (-0700)
Subject: Merged from trunk rev.14096
X-Git-Tag: merge-candidate-3-v1~86^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c4e719630ca46689df134999dce6ba1de4bed16;p=thirdparty%2Fsquid.git

Merged from trunk rev.14096
---

8c4e719630ca46689df134999dce6ba1de4bed16