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

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

8bb5e0ba399f5b565b38facdc832ff16fea9ac31