From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 31 Oct 2011 12:32:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'maniacikarus/proxy'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab63584d8f833254c3d6d50c1bc3ce9cf32b043e;p=ipfire-3.x.git

Merge remote-tracking branch 'maniacikarus/proxy'
---

ab63584d8f833254c3d6d50c1bc3ce9cf32b043e