From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 26 Feb 2015 10:41:51 +0000 (-0800)
Subject: Merge from trunk rev.13952
X-Git-Tag: merge-candidate-3-v1~240^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9db9b92cd9c0c3711f86769502c06012fa500d12;p=thirdparty%2Fsquid.git

Merge from trunk rev.13952
---

9db9b92cd9c0c3711f86769502c06012fa500d12