From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 4 Feb 2015 22:11:38 +0000 (-0800)
Subject: Merge from trunk rev.13907
X-Git-Tag: merge-candidate-3-v1~270^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=056577f16b7fd613635702a1bac91ddcb42ec8e6;p=thirdparty%2Fsquid.git

Merge from trunk rev.13907
---

056577f16b7fd613635702a1bac91ddcb42ec8e6