Wed, 17 May 2017 09:52:06 +0200 merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 17 May 2017 09:52:06 +0200] rev 2372
merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 tip