From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 1 Apr 2011 13:16:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'maniacikarus/proxy'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77a04db2e55eaed242cb4d167e9b3c9e0525a480;p=ipfire-3.x.git

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

77a04db2e55eaed242cb4d167e9b3c9e0525a480