From: Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Date: Tue, 1 Feb 2011 06:41:34 +0000 (+0300)
Subject: Merge 3p2-rock.
X-Git-Tag: take01~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c23c45a16cd97d8c489c02569a424c17c77707b;p=thirdparty%2Fsquid.git

Merge 3p2-rock.
---

6c23c45a16cd97d8c489c02569a424c17c77707b