From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Wed, 13 Jul 2011 10:14:51 +0000 (+0200)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.15.6-1~3^2~27
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=dcca081b1904b4db09658657631d919f280c06d2

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

dcca081b1904b4db09658657631d919f280c06d2