Merge branch 'master' of http://www.netdig.org/git/iramuteq
authorPierre <ratinaud@univ-tlse2.fr>
Fri, 1 Feb 2013 21:47:40 +0000 (22:47 +0100)
committerPierre <ratinaud@univ-tlse2.fr>
Fri, 1 Feb 2013 21:47:40 +0000 (22:47 +0100)

Trivial merge