From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Mon, 26 Mar 2012 11:00:45 +0000 (+0200)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.36-1~5^2~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=549e872c56daec6ec4cf1b0a90fc6c8e58428417;p=lilypond.git

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

549e872c56daec6ec4cf1b0a90fc6c8e58428417