From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 5 Jun 2014 15:08:06 +0000 (-0700)
Subject: Merged from trunk rev.13445
X-Git-Tag: merge-candidate-3-v1~506^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30feab0bcdd28f2d6987ec3ae1e0bd0e42c9de4d;p=thirdparty%2Fsquid.git

Merged from trunk rev.13445
---

30feab0bcdd28f2d6987ec3ae1e0bd0e42c9de4d