From: David Kastrup <dak@gnu.org>
Date: Wed, 7 Mar 2012 21:18:21 +0000 (+0100)
Subject: Merge branch 'fixedtranslation' into HEAD
X-Git-Tag: release/2.15.33-1~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2944a83e59f487894a214769392ce27289accb71;p=lilypond.git

Merge branch 'fixedtranslation' into HEAD

Conflicts:
	Documentation/changes.tely
	Documentation/web/news-front.itexi
	VERSION
	input/regression/layout-from.ly
	lily/context-def.cc
---

2944a83e59f487894a214769392ce27289accb71