From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Tue, 3 May 2011 11:23:06 +0000 (+0200)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.0-1~52^2~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e49d6df0e5302762e33717571c408615d74f705d;p=lilypond.git

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

e49d6df0e5302762e33717571c408615d74f705d