From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Thu, 13 May 2010 11:32:40 +0000 (+0200)
Subject: merged from 3.1
X-Git-Tag: SQUID_3_1_4~26^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc8e41ef4c6ab5913b40746a29d018789f6ae020;p=thirdparty%2Fsquid.git

merged from 3.1
---

fc8e41ef4c6ab5913b40746a29d018789f6ae020