From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Tue, 13 Sep 2011 17:01:30 +0000 (-0600)
Subject: Merged from parent (trunk r11730, v3.2.0.11+).
X-Git-Tag: take08~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4d901d90689cfe333c165f18ebbc788b2f07fc4;p=thirdparty%2Fsquid.git

Merged from parent (trunk r11730, v3.2.0.11+).

3p2-rock and trunk are now the same.
---

b4d901d90689cfe333c165f18ebbc788b2f07fc4