Conflicts:
Documentation/es/notation/fretted-strings.itely
Documentation/es/web/introduction.itexi
Documentation/web/news-front.itexi
VERSION
input/regression/autobeam-nobeam.ly
input/regression/beam-collision-large-object.ly
input/regression/clef-octavation.ly
input/regression/glissando-chord-linebreak.ly
input/regression/glissando-chord.ly
input/regression/glissando-consecutive.ly
input/regression/glissando-index.ly
ly/predefined-mandolin-fretboards.ly