From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Fri, 14 May 2010 04:17:17 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_1_4~25^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d05ea36264ade05a046344ddd1862f9f6d6dee3b;p=thirdparty%2Fsquid.git

Merged from trunk
---

d05ea36264ade05a046344ddd1862f9f6d6dee3b