From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Tue, 28 May 2013 14:31:59 +0000 (-0600)
Subject: Merged from trunk (r12858).
X-Git-Tag: SQUID_3_4_0_1~102^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3b973ccd5a9a8e20d15d3a7e2dc4881bcef0a77;p=thirdparty%2Fsquid.git

Merged from trunk (r12858).
---

f3b973ccd5a9a8e20d15d3a7e2dc4881bcef0a77