4bf56c Merge branch 'master' into f20

Merged and Committed by miminar 5 years ago
1 file changed. 3 lines added. 2 lines removed.
    Merge branch 'master' into f20
    
    Conflicts:
    	pywbem.spec
    
        
file modified
+3 -2