From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 28 Apr 2008 16:38:18 +0000 (-0600)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~45^2~11^2~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70c88e1b8d007dd03eabf910a0ad3eb907eca616;p=thirdparty%2Fsquid.git

Merge from trunk
---

70c88e1b8d007dd03eabf910a0ad3eb907eca616