From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Mon, 16 Apr 2012 09:06:00 +0000 (+0200)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.38-1~25^2~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c833f8a341b81466e084ed031362eadeb4a815aa;p=lilypond.git

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

c833f8a341b81466e084ed031362eadeb4a815aa