Merge branch 'translation' into staging

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

Mon, 6 Aug 2012 15:31:58 +0000 (17:31 +0200)

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

Mon, 6 Aug 2012 15:31:58 +0000 (17:31 +0200)
author Francisco Vila <francisco.vila@hispalinux.es>
Mon, 6 Aug 2012 15:31:58 +0000 (17:31 +0200)
committer Francisco Vila <francisco.vila@hispalinux.es>
Mon, 6 Aug 2012 15:31:58 +0000 (17:31 +0200)
diff --cc Documentation/fr/notation/fretted-strings.itely
Simple merge
diff --cc Documentation/fr/notation/rhythms.itely
Simple merge
diff --cc Documentation/fr/notation/staff.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Mon, 6 Aug 2012 15:31:58 +0000 (17:31 +0200)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Mon, 6 Aug 2012 15:31:58 +0000 (17:31 +0200)
		1	2
Documentation/fr/notation/fretted-strings.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/fr/notation/rhythms.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/fr/notation/staff.itely	patch \|	diff1 \|	diff2 \|	blob \| history