From: John Mandereau <john.mandereau@gmail.com>
Date: Mon, 29 Sep 2008 06:09:25 +0000 (+0200)
Subject: Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.61-1~36
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dc8e9c050a98c809e66b10d9ae1d3df9d3b0190f;p=lilypond.git

Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

Conflicts:

	Documentation/de/user/templates.itely
---

dc8e9c050a98c809e66b10d9ae1d3df9d3b0190f