Merge branch 'master' of http://www.iramuteq.org/git/iramuteq2014-11-03T22:20:14Zpierreratinaud@univ-tlse2.frpierreratinaud@univ-tlse2.fr2014-11-03T22:20:14Zhttp://iramuteq.org/git?p=iramuteq;a=commitdiff;h=b5603a452507554481981b32147a60c17151cade
Merge branch 'master' of iramuteq.org/git/iramuteq
Conflicts:
layout.py
first import2012-06-10T08:17:01ZPierreratinaud@univ-tlse2.frPierreratinaud@univ-tlse2.fr2012-06-10T08:17:01Zhttp://iramuteq.org/git?p=iramuteq;a=commitdiff;h=22cd27b2bbe9ab1ffa7ef06fa764b5147ae17dad