From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 23 Jan 2015 11:31:08 +0000 (-0800)
Subject: Merge from trunk rev.13875
X-Git-Tag: merge-candidate-3-v1~240^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf1934c0d97e1baf628bd566f5b73a9251e56194;p=thirdparty%2Fsquid.git

Merge from trunk rev.13875
---

bf1934c0d97e1baf628bd566f5b73a9251e56194