ab9668 Merge branch 'master' into f13/master

Merged and Committed by peter 8 years ago
    Merge branch 'master' into f13/master
    
    Conflicts:
    	.gitignore
    	sources
    	wings.sh
    	wings.spec
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+6 -2