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

Merge branch 'fixedmerge' into HEAD
---

569714401fbe0e814f0282059f157aa36a54c706