426101 Merge branch 'f20' into f19

Merged and Committed by mpreisle 5 years ago
    Merge branch 'f20' into f19
    
    Conflicts:
    	i3.spec
    	sources
    
        
file modified
+7 -2
file modified
+1 -1