Fri, 18 Jul 2014 16:14:58 +0200 merge from 3.18 branch
Julien Cristau <julien.cristau@logilab.fr> [Fri, 18 Jul 2014 16:14:58 +0200] rev 9894
merge from 3.18 branch
(0) -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip