]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge 3p2-rock.
authorDmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Tue, 1 Feb 2011 09:41:33 +0000 (12:41 +0300)
committerDmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Tue, 1 Feb 2011 09:41:33 +0000 (12:41 +0300)

Trivial merge