8844c86 Merge branch 'master' into f13

Merged and Committed by oget 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	mscore.spec
    	sources
    
        
file modified
+1 -2
file modified
+7 -4
file modified
+1 -1