From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Apr 2012 18:30:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'maniacikarus/proxy'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92d120f24d331a364c4314b8cb7d2faabc389c0d;p=people%2Famarx%2Fipfire-3.x.git

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

92d120f24d331a364c4314b8cb7d2faabc389c0d