From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 16 Oct 2010 07:08:45 +0000 (+0200)
Subject: Merge remote branch 'maniacikarus/proxy' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d63c8b65559cbfa1c65494293538b2613cf33a20;p=ipfire-3.x.git

Merge remote branch 'maniacikarus/proxy' into next
---

d63c8b65559cbfa1c65494293538b2613cf33a20