From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 25 Sep 2015 10:12:56 +0000 (-0700)
Subject: Merge from trunk
X-Git-Tag: SQUID_4_0_1~21^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=890cb4d2b7ed01d200759e7cf9608494d5b3f742;p=thirdparty%2Fsquid.git

Merge from trunk
---

890cb4d2b7ed01d200759e7cf9608494d5b3f742