5cc5225 Merge branch 'master' into epel7

Merged and Committed by toshio 10 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	python-fedora.spec
    
        
file modified
+28 -9