Merge branch 'master' into lilypond/translation

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

Mon, 25 Oct 2010 16:32:33 +0000 (18:32 +0200)

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

Mon, 25 Oct 2010 16:32:33 +0000 (18:32 +0200)
author Francisco Vila <francisco.vila@hispalinux.es>
Mon, 25 Oct 2010 16:32:33 +0000 (18:32 +0200)
committer Francisco Vila <francisco.vila@hispalinux.es>
Mon, 25 Oct 2010 16:32:33 +0000 (18:32 +0200)
diff --cc Documentation/es/learning/common-notation.itely
Simple merge
diff --cc Documentation/es/learning/fundamental.itely
Simple merge
diff --cc Documentation/es/learning/tweaks.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Mon, 25 Oct 2010 16:32:33 +0000 (18:32 +0200)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Mon, 25 Oct 2010 16:32:33 +0000 (18:32 +0200)
		1	2
Documentation/es/learning/common-notation.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/es/learning/fundamental.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/es/learning/tweaks.itely	patch \|	diff1 \|	diff2 \|	blob \| history