From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 28 Mar 2015 13:20:21 +0000 (-0700)
Subject: Merge from trunk rev.13994
X-Git-Tag: merge-candidate-3-v1~199^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26423ede408c18f847707a06e252972025b04a28;p=thirdparty%2Fsquid.git

Merge from trunk rev.13994
---

26423ede408c18f847707a06e252972025b04a28