Merge branch 'lilypond/translation'

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

Mon, 1 Nov 2010 16:18:08 +0000 (17:18 +0100)

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

Mon, 1 Nov 2010 16:18:08 +0000 (17:18 +0100)
author John Mandereau <john.mandereau@gmail.com>
Mon, 1 Nov 2010 16:18:08 +0000 (17:18 +0100)
committer John Mandereau <john.mandereau@gmail.com>
Mon, 1 Nov 2010 16:18:08 +0000 (17:18 +0100)
diff --cc Documentation/de/notation/world.itely
Simple merge
diff --cc Documentation/es/notation/pitches.itely
Simple merge
diff --cc Documentation/es/notation/world.itely
Simple merge
author	John Mandereau <john.mandereau@gmail.com>
	Mon, 1 Nov 2010 16:18:08 +0000 (17:18 +0100)
committer	John Mandereau <john.mandereau@gmail.com>
	Mon, 1 Nov 2010 16:18:08 +0000 (17:18 +0100)
		1	2
Documentation/de/notation/world.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/es/notation/pitches.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/es/notation/world.itely	patch \|	diff1 \|	diff2 \|	blob \| history