8e832a1
Merge branch 'master' of ssh://pkgs.fedoraproject.org/shorewall Conflicts: .gitignore shorewall.spec sources