c70dd1 Merge branch 'master' into el6

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