1d41a8e Merge branch 'master' into el6

Merged and Committed by toshio 11 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	python-fedora.spec
    
        
file modified
+1 -0
file modified
+11 -10
file modified
+1 -1