Merge branch 'master' of http://www.netdig.org/git/iramuteq
authorPierre <ratinaud@univ-tlse2.fr>
Tue, 8 Jan 2013 15:15:26 +0000 (16:15 +0100)
committerPierre <ratinaud@univ-tlse2.fr>
Tue, 8 Jan 2013 15:15:26 +0000 (16:15 +0100)

Trivial merge