Merge branch 'stable/2.14'

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

diff --cc Documentation/es/notation/fretted-strings.itely
Simple merge

diff --cc input/regression/autobeam-nobeam.ly
Simple merge

diff --cc input/regression/glissando-consecutive.ly
index cfcb8de6c33dc53e443bde57eb1056666609a694,62c4085789d51346e3cb83f679a5f5b0ca12258b..cbff423184a0572127bd6b30404d19fb0e25bf00
--- 1/input/regression/glissando-consecutive.ly
--- 2/input/regression/glissando-consecutive.ly
+++ b/input/regression/glissando-consecutive.ly
@@@ -1,4 -1,6 +1,4 @@@
- \version "2.15.0"
+ \version "2.13.61"
 -%% This should really be 2.15.0, because the glissando code
 -%% hasn't been backported -- this is a git-only test at this point
  
  \header {
  

diff --cc input/regression/glissando-index.ly
index bae744123fb2aed140193d369f3fd8c38281ce98,9b2d99cd116c3b6a791546bfe2d8412db6f35b04..bee41d57a7a50456244ed88772240bddb4930ee5
--- 1/input/regression/glissando-index.ly
--- 2/input/regression/glissando-index.ly
+++ b/input/regression/glissando-index.ly
@@@ -1,4 -1,6 +1,4 @@@
- \version "2.15.0"
 -% FIXME: this is a fake version number to allow git master
 -% to compile.  See discussion on lilypond-devel.
+ \version "2.13.61"
  
  \header {
    texidoc = "Individual glissandi within a chord can be tweaked."