forked from extern/shorewall_code
Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall
Conflicts: Shorewall/default.debian Shorewall/init.sh
This commit is contained in:
commit
bf4940fe19
Conflicts: Shorewall/default.debian Shorewall/init.sh