From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Tue, 6 Sep 2011 21:27:17 +0000 (-0600)
Subject: Merged from parent (trunk r11711, v3.2.0.11+).
X-Git-Tag: take08~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0e93c0dc4a3291d452fbf02438cdc1985110462;p=thirdparty%2Fsquid.git

Merged from parent (trunk r11711, v3.2.0.11+).
---

f0e93c0dc4a3291d452fbf02438cdc1985110462