Merge branch 'master' of http://www.iramuteq.org/git/iramuteq
authorpierre <pierre@MacBook-Pro-de-Lerass.local>
Fri, 5 Dec 2014 18:18:57 +0000 (19:18 +0100)
committerpierre <pierre@MacBook-Pro-de-Lerass.local>
Fri, 5 Dec 2014 18:18:57 +0000 (19:18 +0100)
commit346f3426ba279047ab30450bb2fd6c9ebc403c3d
tree639c9a6644222bcb8b0272149bc22f675d8a377c
parent773ca4248f17f17098e34b3c21004713e09e3109
parent42499e5db4394973bd0761d40ea09e515925ed4b
Merge branch 'master' of iramuteq.org/git/iramuteq