From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 4 Sep 2011 18:28:39 +0000 (-0600)
Subject: Merged from parent (trunk r11700, v3.2.0.11+).
X-Git-Tag: take08~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f12f67435a30076d2afeb746aa94fa704c5b8d4;p=thirdparty%2Fsquid.git

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

2f12f67435a30076d2afeb746aa94fa704c5b8d4