From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sun, 2 May 2010 20:26:09 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_2_0_1~237^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0de7452359003760ffb0fdce07177ec4aa4f8f7;p=thirdparty%2Fsquid.git

Merged from trunk
---

b0de7452359003760ffb0fdce07177ec4aa4f8f7