From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Wed, 8 Feb 2012 12:46:40 +0000 (+0100)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.30-1~2^2~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=689382813a007255352a32847ab884ed67192fcc;p=lilypond.git

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

689382813a007255352a32847ab884ed67192fcc