Merge branch 'master' into lilypond/translation

author Francisco Vila <francisco.vila@hispalinux.es>

Tue, 18 Jan 2011 16:19:47 +0000 (17:19 +0100)

committer Francisco Vila <francisco.vila@hispalinux.es>

Tue, 18 Jan 2011 16:19:47 +0000 (17:19 +0100)
author Francisco Vila <francisco.vila@hispalinux.es>
Tue, 18 Jan 2011 16:19:47 +0000 (17:19 +0100)
committer Francisco Vila <francisco.vila@hispalinux.es>
Tue, 18 Jan 2011 16:19:47 +0000 (17:19 +0100)
diff --cc Documentation/de/notation/input.itely
Simple merge
diff --cc Documentation/de/web.texi
Simple merge
diff --cc Documentation/notation/spacing.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Tue, 18 Jan 2011 16:19:47 +0000 (17:19 +0100)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Tue, 18 Jan 2011 16:19:47 +0000 (17:19 +0100)
		1	2
Documentation/de/notation/input.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/de/web.texi	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/notation/spacing.itely	patch \|	diff1 \|	diff2 \|	blob \| history