From: Jean-Charles Malahieude <lilyfan@orange.fr>
Date: Sat, 25 Jul 2015 21:32:01 +0000 (+0200)
Subject: Merge branch 'master' into translation
X-Git-Tag: release/2.19.24-1~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0a34e892b31530e87380bffaac0bb9cf9a1c8a91;p=lilypond.git

Merge branch 'master' into translation

# Conflicts:
#	Documentation/fr/learning/fundamental.itely
---

0a34e892b31530e87380bffaac0bb9cf9a1c8a91