cf3189 Merge branch 'master' into f17

Merged and Committed by limb 8 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	lilypond.spec
    
        
file modified
+9 -0
file modified
+32 -97
file modified
+1 -1