From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Tue, 25 Oct 2011 15:43:55 +0000 (+0200)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.17-1~34^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bb8aa1aed52c49e6e3de8c6c70a876598b11b4a8;p=lilypond.git

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

bb8aa1aed52c49e6e3de8c6c70a876598b11b4a8