From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 30 Dec 2008 02:43:14 +0000 (-0200)
Subject: Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.12.1-1~16^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5d3ad90b7bea98b61c01e00258360e234853aa9b;p=lilypond.git

Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

Conflicts:
	input/regression/musicxml/GNUmakefile
---

5d3ad90b7bea98b61c01e00258360e234853aa9b