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

Merge 3p2-rock.
---

4e70b3a5203cd123f15e30c86397eae73a9bc830