From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 8 Jun 2007 23:46:00 +0000 (-0300)
Subject: Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.27-1~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=827797f2d209e14f09a17017e10ea27d17db4a8e;p=lilypond.git

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

Conflicts:

	input/lsr/text/creating-text-spanners.ly
---

827797f2d209e14f09a17017e10ea27d17db4a8e