Sun, 01 Oct 2017 12:28:52 +0200 more standard merge operation;
wenzelm [Sun, 01 Oct 2017 12:28:52 +0200] rev 66736
more standard merge operation;
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 +10000 tip