ade49da Merge branch 'master' into epel7

Merged and Committed by mcepl 10 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	python-mccabe.spec
    
        
file modified
+5 -2