9fe6909 Merge branch 'master' of ssh://pkgs.fedoraproject.org/alliance

Merged and Committed by cicku 9 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/alliance
    
    Conflicts:
    	alliance.spec
    
        
file modified
+4 -0