From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Thu, 28 Aug 2008 15:43:24 +0000 (+0200)
Subject: Merge branches 'master' and 'lilypond/translation'
X-Git-Tag: release/2.11.58-1~32^2~12^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=22c2d2d054c2ee6d4cab631bc47251f7f340c072;p=lilypond.git

Merge branches 'master' and 'lilypond/translation'
---

22c2d2d054c2ee6d4cab631bc47251f7f340c072