d017f98 Merge branch 'master' into epel7

Merged and Committed by dmlb2000 6 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	rancid.spec
    
        
file modified
+1 -0
file modified
+28 -22
file modified
+2 -1