ea9462 Merge branch 'master' into el4

Merged and Committed by ktdreyer 7 years ago
    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore
    	cacti.spec
    	sources
    
        
file modified
+2 -1
file modified
+12 -1
file modified
+1 -1