Merge branch 'master' of http://www.iramuteq.org/git/iramuteq
authorpierre <ratinaud@univ-tlse2.fr>
Mon, 22 Sep 2014 09:22:45 +0000 (11:22 +0200)
committerpierre <ratinaud@univ-tlse2.fr>
Mon, 22 Sep 2014 09:22:45 +0000 (11:22 +0200)
commit357e5403d3c539083a1052248628f0aab1af1eaa
treeccd8ddd0d620b54e66bfe47c7de0805c65f5c234
parent4efa1d6083096de61aed08a9b64bae41f48e13aa
parent07e3f63fabafe6a7f90134a4e4bf229151d11f87
Merge branch 'master' of iramuteq.org/git/iramuteq

Conflicts:
layout.py