Merge branch 'master' of http://www.iramuteq.org/git/iramuteq
authorPierre Ratinaud <ratinaud@univ-tlse2.fr>
Mon, 17 Nov 2014 23:19:29 +0000 (00:19 +0100)
committerPierre Ratinaud <ratinaud@univ-tlse2.fr>
Mon, 17 Nov 2014 23:19:29 +0000 (00:19 +0100)

Trivial merge