e4bbc81 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-setuptools

Merged and Committed by toshio 10 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-setuptools
    
    Conflicts:
    	python-setuptools.spec
    
        
file modified
+9 -3