From: John Mandereau <john.mandereau@gmail.com>
Date: Mon, 27 Sep 2010 07:35:21 +0000 (+0200)
Subject: Merge branch 'lilypond/translation'
X-Git-Tag: release/2.13.35-1~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a8d54f44df1fe4f89823f6b78364870ce51174dc;p=lilypond.git

Merge branch 'lilypond/translation'

Conflicts:
	Documentation/fr/web/introduction.itexi

I retained the most recently added committish in
Documentation/fr/web/introduction.itexi.
---

a8d54f44df1fe4f89823f6b78364870ce51174dc