Fri, 16 Jun 2017 11:32:21 +0200 merge with stable stable
Boris Feld <boris.feld@octobus.net> [Fri, 16 Jun 2017 11:32:21 +0200] rev 2594
merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 tip