From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 15 Mar 2011 08:09:47 +0000 (+0100)
Subject: Merge branch 'squid'
X-Git-Tag: v2.9-core48~5^2~2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f599cf7c4ae36a382a1baf0923ee24ce01b45fdc

Merge branch 'squid'
---

f599cf7c4ae36a382a1baf0923ee24ce01b45fdc