Merge remote-tracking branch 'amarx/firewall-dnat' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Sep 2014 10:55:55 +0000 (12:55 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Sep 2014 10:55:55 +0000 (12:55 +0200)
commitdf6649b0feb13d5a08bdcff7bb1eb65b538b23ca
tree0101d83d352ff32e89f1892da7548812711dfc01
parentb30890aa068415f5c47ee76d90b19753f0ee1da5
parent48f07c195761d0c7129b6beb314c339ba7164eaf
Merge remote-tracking branch 'amarx/firewall-dnat' into next

Conflicts:
config/firewall/rules.pl
config/firewall/rules.pl
html/cgi-bin/fwhosts.cgi