From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Sun, 20 Jun 2010 15:56:02 +0000 (+0200)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.13.25-1~1^2~1^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3f6f94a2a94833abcd8dc280e1e97da3c42d68d3;p=lilypond.git

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

3f6f94a2a94833abcd8dc280e1e97da3c42d68d3