From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sun, 2 May 2010 18:53:34 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_2_0_1~237^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b3470cec3866485836b749bcfcecb9dbfec3688;p=thirdparty%2Fsquid.git

Merged from trunk
---

9b3470cec3866485836b749bcfcecb9dbfec3688