From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 2 Apr 2011 18:12:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'maniacikarus/proxy'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71c9053f3c2e4fbfa82442d7e25d02904dfdb764;p=ipfire-3.x.git

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

71c9053f3c2e4fbfa82442d7e25d02904dfdb764