From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 20 Nov 2007 00:58:31 +0000 (-0200)
Subject: Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.35-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b6ba138a2e5f8542b1278721c70f28f3a0400b3c;p=lilypond.git

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

Conflicts:

	GNUmakefile.in
---

b6ba138a2e5f8542b1278721c70f28f3a0400b3c