d15338d Merge branch 'master' of ssh://pkgs.fedoraproject.org/make

Merged and Committed by Petr Machata 12 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/make
    
    Conflicts:
    	make.spec
    
        
file modified
+5 -2