From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 11 Mar 2015 08:11:17 +0000 (-0700)
Subject: Merged from trunk rev.13970
X-Git-Tag: merge-candidate-3-v1~199^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a95dff28ab4664969fea123c44bcd0671ccc8d2f;p=thirdparty%2Fsquid.git

Merged from trunk rev.13970
---

a95dff28ab4664969fea123c44bcd0671ccc8d2f