From: Till Paala <till.rettig@gmx.de>
Date: Tue, 11 Sep 2012 06:45:32 +0000 (+0300)
Subject: Merge branch 'translation' of ssh://git.sv.gnu.org/srv/git/lilypond into translation
X-Git-Tag: release/2.17.6-1~46^2~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=522f419e3ed3e09ecf834bbb5315ac1777ab13e0;p=lilypond.git

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

Conflicts:
	Documentation/de/learning/tweaks.itely
	Documentation/de/notation/changing-defaults.itely
---

522f419e3ed3e09ecf834bbb5315ac1777ab13e0