From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 26 May 2016 14:48:59 +0000 (+1200)
Subject: Merge from trunk rev.14687
X-Git-Tag: SQUID_4_0_13~39^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f71f64024ca83eeb24db9ef0dc2204a093fcb7b4;p=thirdparty%2Fsquid.git

Merge from trunk rev.14687
---

f71f64024ca83eeb24db9ef0dc2204a093fcb7b4