From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Sat, 7 Jan 2012 11:59:56 +0000 (+0100)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.25-1~31^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d199c2786d16e1fc00bd17fd9b1a54a8312e2079;p=lilypond.git

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

d199c2786d16e1fc00bd17fd9b1a54a8312e2079