]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond
authorCarl Sorensen <c_sorensen@byu.edu>
Fri, 1 May 2009 21:47:43 +0000 (15:47 -0600)
committerCarl Sorensen <c_sorensen@byu.edu>
Fri, 1 May 2009 21:47:43 +0000 (15:47 -0600)
Conflicts:
Documentation/user/lilypond.tely


Trivial merge