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

Merge 3p2-rock.
---

65241974dd23dd36998b52d13cb19e9a0dec373c