From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 2 May 2010 12:23:28 +0000 (+0200)
Subject: Merge remote branch 'stevee/squid' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0ceec2e5963334a59de36298713441b612a974c;p=ipfire-3.x.git

Merge remote branch 'stevee/squid' into next
---

b0ceec2e5963334a59de36298713441b612a974c