Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev/texi2html

Conflicts:

	buildscripts/add_html_footer.py
	input/lsr/ancient-notation-intro.itely
	input/lsr/chords-intro.itely
	input/lsr/contexts-and-engravers-intro.itely
	input/lsr/expressive-marks-intro.itely
	input/lsr/midi-intro.itely
	input/lsr/paper-and-layout-intro.itely
	input/lsr/percussion-intro.itely
	input/lsr/pitches-intro.itely
	input/lsr/repeats-intro.itely
	input/lsr/rhythms-intro.itely
	input/lsr/simultaneous-notes-intro.itely
	input/lsr/spacing-intro.itely
	input/lsr/staff-notation-intro.itely
	input/lsr/text-intro.itely
	input/lsr/titles-intro.itely
	input/lsr/tweaks-and-overrides-intro.itely
	input/lsr/vocal-music-intro.itely