c6629f1 Merge branch 'master' into epel7

Merged and Committed by Jan ONDREJ (SAL) 8 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	mod_evasive.spec
    
        
file modified
+2 -2
file modified
+18 -3