61cb1f3 Merge branch 'master' into epel7

Merged and Committed by Orion Poplawski 7 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	pyflakes.spec
    
        
file modified
+1 -2
file modified
+96 -54
file modified
+2 -3