1c04ae2 Merge branch 'master' into el5

Merged and Committed by athmane 11 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	mod_security.conf
    	mod_security.spec
    	sources
    
        
file modified
+9 -0
file modified
+50 -85
file modified
+31 -4
file modified
+1 -1