89a07f7 Merge branch 'f20' of ssh://pkgs.fedoraproject.org/python3 into f20

Merged and Committed by churchyard 9 years ago
    Merge branch 'f20' of ssh://pkgs.fedoraproject.org/python3 into f20
    
    Conflicts:
    	python3.spec
    
        
file modified
+13 -2