From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Mon, 16 Jan 2012 23:27:57 +0000 (+0100)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.27-1~31^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0640f8495c4af9cf7cf2ca7b952b3ee0bcd0b2bf;p=lilypond.git

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

0640f8495c4af9cf7cf2ca7b952b3ee0bcd0b2bf