From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 5 Jun 2014 10:04:20 +0000 (-0700)
Subject: Merge from trunk rev.13442
X-Git-Tag: merge-candidate-3-v1~506^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0daf93887658cd22a0927bce5e5bf1e9df554be9;p=thirdparty%2Fsquid.git

Merge from trunk rev.13442
---

0daf93887658cd22a0927bce5e5bf1e9df554be9