Merge branch 'master' of http://www.iramuteq.org/git/iramuteq
authorPierre <ratinaud@univ-tlse2.fr>
Thu, 31 Oct 2013 10:03:53 +0000 (11:03 +0100)
committerPierre <ratinaud@univ-tlse2.fr>
Thu, 31 Oct 2013 10:03:53 +0000 (11:03 +0100)
commit1eebb48d56a3fecb1e753073c0a9cdca87cde421
treea448987dc7645241dac09aa8e5e8299a1165aab5
parent4f03168db9e8a5addd64bd37f9f6762baae0fc11
parent45dd6badc0446adedf6728d3d8f7f28cfec2c6db
Merge branch 'master' of iramuteq.org/git/iramuteq
merge