Merge branch 'master' into lilypond/translation

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

Wed, 7 Dec 2011 09:39:22 +0000 (10:39 +0100)

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

Wed, 7 Dec 2011 09:39:22 +0000 (10:39 +0100)
author Francisco Vila <francisco.vila@hispalinux.es>
Wed, 7 Dec 2011 09:39:22 +0000 (10:39 +0100)
committer Francisco Vila <francisco.vila@hispalinux.es>
Wed, 7 Dec 2011 09:39:22 +0000 (10:39 +0100)
diff --cc Documentation/es/notation/changing-defaults.itely
Simple merge
diff --cc Documentation/fr/notation/pitches.itely
Simple merge
diff --cc Documentation/fr/notation/spacing.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Wed, 7 Dec 2011 09:39:22 +0000 (10:39 +0100)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Wed, 7 Dec 2011 09:39:22 +0000 (10:39 +0100)
		1	2
Documentation/es/notation/changing-defaults.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/fr/notation/pitches.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/fr/notation/spacing.itely	patch \|	diff1 \|	diff2 \|	blob \| history