From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Mon, 29 Aug 2011 10:12:03 +0000 (+0200)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.9-1~5^2~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b9a18c38bf25fe66b0ecea5e83d7beaf69ffa6c0;p=lilypond.git

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

b9a18c38bf25fe66b0ecea5e83d7beaf69ffa6c0