From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 1 Nov 2006 16:56:52 +0000 (+0100)
Subject: Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen
X-Git-Tag: release/2.10.0-2~34^2~44
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=233b4e7d0c05222c5b596a51334553e25a9864b7;p=lilypond.git

Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen

Conflicts:

	buildscripts/git-update-changelog.py
---

233b4e7d0c05222c5b596a51334553e25a9864b7