From: pierre <ratinaud@univ-tlse2.fr>
Date: Mon, 22 Sep 2014 09:22:45 +0000 (+0200)
Subject: Merge branch 'master' of http://www.iramuteq.org/git/iramuteq
X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=commitdiff_plain;h=357e5403d3c539083a1052248628f0aab1af1eaa

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

Conflicts:
	layout.py
---

357e5403d3c539083a1052248628f0aab1af1eaa