From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 31 Mar 2008 01:06:13 +0000 (-0600)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~302^2~20
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=63b671d2b602a6c7ee6e236759d63bf16886f46a;p=thirdparty%2Fsquid.git

Merge from trunk
---

63b671d2b602a6c7ee6e236759d63bf16886f46a