Merge branch 'origin' of http://lilypond.org/vc/lilypond into master-hanwen
commitcd0147ec9143233613839a4cc855213b700cfb17
authorHan-Wen Nienhuys <hanwen@lilypond.org>
Sat, 28 Oct 2006 23:14:51 +0000 (29 01:14 +0200)
committerHan-Wen Nienhuys <hanwen@lilypond.org>
Sat, 28 Oct 2006 23:14:51 +0000 (29 01:14 +0200)
tree040e4ca09cc2ce4a75a261bad52ec120ea21c027
parent52db72547dd34ad68991bdbd93f4ca91a7bd846d
parent8dce0496a9adddea4b507440f73020d863e6cf38
Merge branch 'origin' of lilypond.org/vc/lilypond into master-hanwen

Conflicts:

ChangeLog
buildscripts/git-update-changelog.py