Merge branch 'iptables-upnpfw' into core67-merge
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:57:39 +0000 (13:57 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:57:39 +0000 (13:57 +0100)
1  2 
src/initscripts/init.d/firewall

Simple merge