...
authorpierre <pierre@esp-at7.crie.i-univ-tlse2.fr>
Thu, 4 Dec 2014 10:47:36 +0000 (11:47 +0100)
committerpierre <pierre@esp-at7.crie.i-univ-tlse2.fr>
Thu, 4 Dec 2014 10:47:36 +0000 (11:47 +0100)
Merge branch 'master' of http://www.iramuteq.org/git/iramuteq

1  2 
listlex.py

diff --cc listlex.py
Simple merge