From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Tue, 5 Jul 2011 11:05:06 +0000 (+0200)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.5-1~21
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6353f0972b47829b4003763f5d73a79192cb248a;p=lilypond.git

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

6353f0972b47829b4003763f5d73a79192cb248a