From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 12 Jul 2014 16:02:08 +0000 (-0700)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_5_0_1~75^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd2f300a989d209847a5035e7aca8fd1d395d931;p=thirdparty%2Fsquid.git

Merge from trunk
---

fd2f300a989d209847a5035e7aca8fd1d395d931