From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Thu, 1 Mar 2012 14:38:35 +0000 (+0100)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.33-1~2^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=17183f4a9696f2187128490a669895964959fa84;p=lilypond.git

Merge branch 'master' into lilypond/translation
---

17183f4a9696f2187128490a669895964959fa84