From: Jean-Charles Malahieude <lilyfan@orange.fr>
Date: Fri, 21 Jun 2013 19:20:08 +0000 (+0200)
Subject: Merge branch 'master' into translation
X-Git-Tag: release/2.17.21-1~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bd751630011a6fbfcf069ec1fc41a8eaed8a6b87;p=lilypond.git

Merge branch 'master' into translation
---

bd751630011a6fbfcf069ec1fc41a8eaed8a6b87