eadf95d Merge remote-tracking branch 'origin/master' into el6/master

Merged and Committed by rebus 13 years ago
    Merge remote-tracking branch 'origin/master' into el6/master
    
    Conflicts:
    	.gitignore
    	nikto-libwhisker2.patch
    	nikto.spec
    	sources
    
        
file modified
+2 -0
file modified
+17 -10
file modified
+14 -4
file modified
+1 -1