Merge branch 'master' into lilypond/translation

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

Mon, 16 Apr 2012 09:06:00 +0000 (11:06 +0200)

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

Mon, 16 Apr 2012 09:06:00 +0000 (11:06 +0200)
author Francisco Vila <francisco.vila@hispalinux.es>
Mon, 16 Apr 2012 09:06:00 +0000 (11:06 +0200)
committer Francisco Vila <francisco.vila@hispalinux.es>
Mon, 16 Apr 2012 09:06:00 +0000 (11:06 +0200)
diff --cc Documentation/es/usage/lilypond-book.itely
Simple merge
diff --cc Documentation/it/learning/templates.itely
Simple merge
diff --cc Documentation/it/usage/lilypond-book.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Mon, 16 Apr 2012 09:06:00 +0000 (11:06 +0200)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Mon, 16 Apr 2012 09:06:00 +0000 (11:06 +0200)
		1	2
Documentation/es/usage/lilypond-book.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/it/learning/templates.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/it/usage/lilypond-book.itely	patch \|	diff1 \|	diff2 \|	blob \| history