From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Mon, 7 Nov 2011 01:02:43 +0000 (+0100)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.17-1~18^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3b8f430efd506ccd6ae8235be0f08468c0da937d;p=lilypond.git

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

3b8f430efd506ccd6ae8235be0f08468c0da937d