From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 28 Oct 2006 23:14:51 +0000 (+0200)
Subject: Merge branch 'origin' of http://lilypond.org/vc/lilypond into master-hanwen
X-Git-Tag: release/2.10.0-2~42
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fc0f1b8d020fefe9317912c4bc8489575c751aea;p=lilypond.git

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

Conflicts:

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

fc0f1b8d020fefe9317912c4bc8489575c751aea