d5bec8 Merge branch 'master' into f15

Merged and Committed by Jon Ciesla 9 years ago
    Merge branch 'master' into f15
    
    Conflicts:
    	lilypond.spec
    
        
file modified
+15 -0
file modified
+48 -3
file modified
+1 -1