Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --cc input/lsr/keyboards.snippet-list
index 855b6c13aba9eeba6a7fc7bd0c5eb7a7467d3e95,8c0fa80aa8db7d048d0745598a8d95255a30c532..ce844b12ac4b5a260b8d523b73a857dbb2ff90c7
--- 1/input/lsr/keyboards.snippet-list
--- 2/input/lsr/keyboards.snippet-list
+++ b/input/lsr/keyboards.snippet-list
@@@ -1,7 -1,6 +1,6 @@@
- indicating-cross-staff-chords-with-arpeggio-bracket.ly
  clusters.ly
  creating-slurs-across-voices.ly
 -piano-template-with-centered-lyrics.ly
 +jazz-combo-template.ly
  vocal-ensemble-template-with-automatic-piano-reduction.ly
  piano-template-simple.ly
  piano-template-with-centered-dynamics.ly