From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Tue, 24 Jan 2012 17:34:35 +0000 (+0100)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.28-1~3^2~14
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=1be9b72e4f00f7273a8e5ff220b710a52f975344

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

1be9b72e4f00f7273a8e5ff220b710a52f975344