From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 21 Jan 2012 11:59:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'maniacikarus/iptables'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d694011b286b62d43cdecfc74b8d3117298533d;p=ipfire-3.x.git

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

3d694011b286b62d43cdecfc74b8d3117298533d