e959f15 Merge branch 'master' into epel7 correctly

Merged and Committed by loveshack 4 years ago
    Merge branch 'master' into epel7 correctly
    
    Conflicts:
    	otf2.spec
    
        
file modified
+4 -0
file modified
+4 -4
file modified
+0 -1
file modified
+1 -1