From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 7 May 2015 16:29:15 +0000 (-0700)
Subject: Merge from trunk rev.14061
X-Git-Tag: merge-candidate-3-v1~101^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=187b55933d0878c4f3f3fac330b3056201c4dc50;p=thirdparty%2Fsquid.git

Merge from trunk rev.14061
---

187b55933d0878c4f3f3fac330b3056201c4dc50