Wed, 01 Feb 2017 15:32:59 +0100 merge with 5.6.0 mercurial-3.8
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:32:59 +0100] rev 1796
merge with 5.6.0 A minor one line conflict on test output were encountered.
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip