From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 23 Mar 2014 02:56:12 +0000 (-0700)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_5_0_1~321^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=243a89a4e4d65ea77a8f2d9373606b1a89cee2ef;p=thirdparty%2Fsquid.git

Merge from trunk
---

243a89a4e4d65ea77a8f2d9373606b1a89cee2ef