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

Conflicts:

	lily/page-breaking.cc

diff --cc lily/constrained-breaking.cc
index 9eaa3d6c6e39868f1952ee223884a45a6282f640,a4f3ac4b57a286d514518cb62bbe448f723fc80e..33426c0b3f3b0ca5bcd24bd5f38263431b9013fe
--- 1/lily/constrained-breaking.cc
--- 2/lily/constrained-breaking.cc
+++ b/lily/constrained-breaking.cc
@@@ -262,9 -272,9 +262,9 @@@ Constrained_breaking::min_system_count 
  }
  
  int
 -Constrained_breaking::get_max_systems (vsize start, vsize end)
 +Constrained_breaking::max_system_count (vsize start, vsize end)
  {
-   vsize brk = (end >= start_.size ()) ? breaks_.size () - 1 : starting_breakpoints_[end];
+   vsize brk = (end >= start_.size ()) ? breaks_.size () : starting_breakpoints_[end];
    return brk - starting_breakpoints_[start];
  }
  

diff --cc lily/dynamic-engraver.cc
Simple merge

diff --cc lily/grob.cc
Simple merge

diff --cc lily/include/grob.hh
Simple merge

diff --cc lily/page-breaking.cc
Simple merge

diff --cc ly/engraver-init.ly
Simple merge

diff --cc scm/define-grob-properties.scm
Simple merge

diff --cc scm/define-grobs.scm
Simple merge