9e88d7e Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora

Merged and Committed by toshio 12 years ago
1 file changed. 0 lines added. 3 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-fedora
    
    Conflicts:
    	.gitignore
    	python-fedora.spec
    	sources
    
        
file modified
+0 -3