Merge remote-tracking branch 'origin/translation' into staging

author David Kastrup <dak@gnu.org>

Sun, 15 Jun 2014 23:03:23 +0000 (01:03 +0200)

committer David Kastrup <dak@gnu.org>

Sun, 15 Jun 2014 23:03:23 +0000 (01:03 +0200)
author David Kastrup <dak@gnu.org>
Sun, 15 Jun 2014 23:03:23 +0000 (01:03 +0200)
committer David Kastrup <dak@gnu.org>
Sun, 15 Jun 2014 23:03:23 +0000 (01:03 +0200)
diff --cc Documentation/fr/notation/changing-defaults.itely
Simple merge
diff --cc Documentation/lilypond-texi2html.init
Simple merge
author	David Kastrup <dak@gnu.org>
	Sun, 15 Jun 2014 23:03:23 +0000 (01:03 +0200)
committer	David Kastrup <dak@gnu.org>
	Sun, 15 Jun 2014 23:03:23 +0000 (01:03 +0200)
		1	2
Documentation/fr/notation/changing-defaults.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/lilypond-texi2html.init	patch \|	diff1 \|	diff2 \|	blob \| history