fca11a8 Merge remote branch 'origin/master' into f31

Merged and Committed by robert 4 years ago
    Merge remote branch 'origin/master' into f31
    
    Conflicts:
    	mingw-libidn2.spec
    	sources
    
        
file modified
+7 -1
file modified
+2 -2