1d32587 Merge branch 'master' into f15

Merged and Committed by fab 12 years ago
    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	python-distutils-extra.spec
    	sources
    
        
file modified
+6 -0
file modified
+14 -2
file modified
+4 -0