339e4ad Merge branch 'master' of ssh://git.fedorahosted.org/git/fedpkg

Merged and Committed by ausil 10 years ago
    Merge branch 'master' of ssh://git.fedorahosted.org/git/fedpkg
    
    Conflicts:
    	fedpkg.spec
    	setup.py
    
        
file modified
+4 -1
file modified
+1 -1
file modified
+1 -1