Merge branch 'master' of http://www.iramuteq.org/git/iramuteq
authorpierre <pierre@MacBook-Pro-de-Lerass.local>
Mon, 3 Nov 2014 22:50:31 +0000 (23:50 +0100)
committerpierre <pierre@MacBook-Pro-de-Lerass.local>
Mon, 3 Nov 2014 22:50:31 +0000 (23:50 +0100)
1  2 
listlex.py

diff --cc listlex.py
Simple merge