From: pierre <ratinaud@univ-tlse2.fr>
Date: Mon, 3 Nov 2014 22:20:14 +0000 (+0100)
Subject: Merge branch 'master' of http://www.iramuteq.org/git/iramuteq
X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=commitdiff_plain;h=b5603a452507554481981b32147a60c17151cade;hp=b5603a452507554481981b32147a60c17151cade

Merge branch 'master' of iramuteq.org/git/iramuteq

Conflicts:
	layout.py
---