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

author John Mandereau <john.mandereau@gmail.com>

Sun, 7 Dec 2008 20:52:18 +0000 (21:52 +0100)

committer John Mandereau <john.mandereau@gmail.com>

Sun, 7 Dec 2008 20:52:18 +0000 (21:52 +0100)
author John Mandereau <john.mandereau@gmail.com>
Sun, 7 Dec 2008 20:52:18 +0000 (21:52 +0100)
committer John Mandereau <john.mandereau@gmail.com>
Sun, 7 Dec 2008 20:52:18 +0000 (21:52 +0100)
diff --cc Documentation/de/user/introduction.itely
Simple merge
diff --cc Documentation/de/user/lilypond-book.itely
Simple merge
author	John Mandereau <john.mandereau@gmail.com>
	Sun, 7 Dec 2008 20:52:18 +0000 (21:52 +0100)
committer	John Mandereau <john.mandereau@gmail.com>
	Sun, 7 Dec 2008 20:52:18 +0000 (21:52 +0100)
		1	2
Documentation/de/user/introduction.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/de/user/lilypond-book.itely	patch \|	diff1 \|	diff2 \|	blob \| history