From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Tue, 2 Mar 2010 00:31:09 +0000 (+0100)
Subject: Merged with trunk
X-Git-Tag: SQUID_3_2_0_1~386^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f657875bb268126cb7f74028126bb39f960df379;p=thirdparty%2Fsquid.git

Merged with trunk
---

f657875bb268126cb7f74028126bb39f960df379