From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 5 Aug 2014 15:24:33 +0000 (-0700)
Subject: Merge from trunk rev.13526
X-Git-Tag: SQUID_3_5_0_1~75^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4de704259e613862bb7a6893be30c2fd3ee81bc8;p=thirdparty%2Fsquid.git

Merge from trunk rev.13526
---

4de704259e613862bb7a6893be30c2fd3ee81bc8