49b373 Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy

Merged and Committed by Dan Walsh 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy
    
    Conflicts:
    	selinux-policy.spec
    
        
file modified
+71 -39
file modified
+6 -1