Merge branch 'master' of git://git.sv.gnu.org/lilypond.git into td-lily

diff --cc input/new/setting-hairpin-behavior-at-bar-lines.ly
index 0000000000000000000000000000000000000000,56508717920968068f70649394c3caf6b81bcd18..864f29184b79161cf5f89bc986453c52032423fa
mode 000000,100644..100644
--- /dev/null
--- 2/input/new/setting-hairpin-behavior-at-bar-lines.ly
+++ b/input/new/setting-hairpin-behavior-at-bar-lines.ly
@@@ -1,0 -1,17 +1,17 @@@
 -\version "2.11.46"\r
 -\header {\r
 -  lsrtags = "expressive-marks"\r
 -  texidoc = "If the note which ends a hairpin falls on a downbeat,\r
 -the hairpin stops at the bar line immediately preceding.  This behavior\r
 -can be controlled by overriding the @code{'to-barline} property.\r
 -"\r
 -  doctitle = "Setting hairpin behavior at bar lines"\r
 -}\r
 -\r
 -\relative c'' {\r
 -  e4\< e2.\r
 -  e1\!\r
 -  \override Hairpin #'to-barline = ##f\r
 -  e4\< e2.\r
 -  e1\!\r
 -}\r
++\version "2.11.46"
++\header {
++  lsrtags = "expressive-marks"
++  texidoc = "If the note which ends a hairpin falls on a downbeat,
++the hairpin stops at the bar line immediately preceding.  This behavior
++can be controlled by overriding the @code{'to-barline} property.
++"
++  doctitle = "Setting hairpin behavior at bar lines"
++}
++
++\relative c'' {
++  e4\< e2.
++  e1\!
++  \override Hairpin #'to-barline = ##f
++  e4\< e2.
++  e1\!
++}