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

Conflicts:

	lily/tuplet-engraver.cc

diff --cc lily/dynamic-performer.cc
index 47abca1ead515d9d363639d3cb2f005cb0e8daf7,47abca1ead515d9d363639d3cb2f005cb0e8daf7..9b8f366843404336f72ea36da38b1714f85c28f1
--- 1/lily/dynamic-performer.cc
--- 2/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@@ -149,7 -149,7 +149,6 @@@ Dynamic_performer::stop_translation_tim
        finished_span_dynamic_->render ();
        finished_span_dynamic_ = 0;
      }
--
    
    if (absolute_ && absolute_->volume_ < 0)
      {