aa79af2 Merge remote branch 'origin/master' into epel7

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