Thu, 30 Jun 2011 13:38:30 +0200 [i18n] fix undetected conflict
Sylvain Thénault <sylvain.thenault@logilab.fr> [Thu, 30 Jun 2011 13:38:30 +0200] rev 7588
[i18n] fix undetected conflict
(0) -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip