From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 28 Feb 2015 00:41:08 +0000 (-0800)
Subject: Merged from trunk rev.13957
X-Git-Tag: merge-candidate-3-v1~199^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6147e648c1afa450324ca0b5437e6774c22075ff;p=thirdparty%2Fsquid.git

Merged from trunk rev.13957
---

6147e648c1afa450324ca0b5437e6774c22075ff