Merge branch 'master' of ssh+git://gpercival@git.sv.gnu.org/srv/git/lilypond

Conflicts:

	input/lsr/connecting/Laissez-vibrer-ties.ly
	input/lsr/repeats/Volta-multi-staff.ly
	input/lsr/spacing/Page-spacing.ly
	input/lsr/spacing/Proportional-spacing.ly
	input/lsr/spacing/Proportional-strict-grace-notes.ly
	input/lsr/spacing/Proportional-strict-notespacing.ly
	input/lsr/spacing/alignment-vertical-spacing.ly
	input/lsr/staff/Staff-line-positions.ly
	input/lsr/text/font-family-override.ly
	input/lsr/vocal/Ambitus.ly
	input/lsr/vocal/lyric-combine.ly