From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 6 Jun 2014 11:56:55 +0000 (-0700)
Subject: Merge fron trunk rev.13451
X-Git-Tag: merge-candidate-3-v1~506^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de4c39ab79dfd24cd283d32383fc6480adc24ee1;p=thirdparty%2Fsquid.git

Merge fron trunk rev.13451
---

de4c39ab79dfd24cd283d32383fc6480adc24ee1