From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 18 Nov 2008 02:47:13 +0000 (-0200)
Subject: Merge branch 'origin'
X-Git-Tag: release/2.11.65-1~51
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2ff13e6574980c37bb7cd4dd9bf5731805ba6524;p=lilypond.git

Merge branch 'origin'

Conflicts:

	input/regression/musicxml/GNUmakefile
---

2ff13e6574980c37bb7cd4dd9bf5731805ba6524