From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 16 Mar 2015 10:24:04 +0000 (-0700)
Subject: Merge from trunk rev.13981
X-Git-Tag: merge-candidate-3-v1~199^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4417e854e23095a19d7a19dde969e0dcbe8d1897;p=thirdparty%2Fsquid.git

Merge from trunk rev.13981
---

4417e854e23095a19d7a19dde969e0dcbe8d1897