Merge branch 'master' into lilypond/translation

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

Thu, 18 Dec 2008 11:04:36 +0000 (12:04 +0100)

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

Thu, 18 Dec 2008 11:04:36 +0000 (12:04 +0100)
author Francisco Vila <francisco.vila@hispalinux.es>
Thu, 18 Dec 2008 11:04:36 +0000 (12:04 +0100)
committer Francisco Vila <francisco.vila@hispalinux.es>
Thu, 18 Dec 2008 11:04:36 +0000 (12:04 +0100)
diff --cc Documentation/de/user/tweaks.itely
Simple merge
diff --cc Documentation/es/user/pitches.itely
Simple merge
diff --cc Documentation/es/user/tweaks.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Thu, 18 Dec 2008 11:04:36 +0000 (12:04 +0100)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Thu, 18 Dec 2008 11:04:36 +0000 (12:04 +0100)
		1	2
Documentation/de/user/tweaks.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/es/user/pitches.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/es/user/tweaks.itely	patch \|	diff1 \|	diff2 \|	blob \| history