Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond
commit758b0a28ff3a55fead538590a54b72ca281db09d
authorCarl Sorensen <c_sorensen@byu.edu>
Fri, 1 May 2009 21:47:43 +0000 (1 15:47 -0600)
committerCarl Sorensen <c_sorensen@byu.edu>
Fri, 1 May 2009 21:47:43 +0000 (1 15:47 -0600)
tree132c3c6aba179f075375ce8889ab1bc40d74d750
parentd420ce8f58b72051af55defd7daa382ed920a075
parent452c8141d29c8a070d349f2798f2695ff8defd94
Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond

Conflicts:
Documentation/user/lilypond.tely