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

author Till Paala <till.rettig@gmx.de>

Fri, 14 Jan 2011 20:18:01 +0000 (22:18 +0200)

committer Till Paala <till.rettig@gmx.de>

Fri, 14 Jan 2011 20:18:01 +0000 (22:18 +0200)
author Till Paala <till.rettig@gmx.de>
Fri, 14 Jan 2011 20:18:01 +0000 (22:18 +0200)
committer Till Paala <till.rettig@gmx.de>
Fri, 14 Jan 2011 20:18:01 +0000 (22:18 +0200)
diff --cc Documentation/de/notation/fretted-strings.itely
Simple merge
author	Till Paala <till.rettig@gmx.de>
	Fri, 14 Jan 2011 20:18:01 +0000 (22:18 +0200)
committer	Till Paala <till.rettig@gmx.de>
	Fri, 14 Jan 2011 20:18:01 +0000 (22:18 +0200)