016b48f Merge branch 'master' into epel7

Merged and Committed by Chris Hambridge 6 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	.gitignore
    	rho.spec
    	sources
    
        
file modified
+2 -0
file removed
-21
file added
+0
empty file added
file modified
+43 -8
file modified
+1 -1