Merge branch 'master' of http://www.netdig.org/git/iramuteq
authorpierre <ratinaud@univ-tlse2.fr>
Mon, 28 Jan 2013 23:18:43 +0000 (00:18 +0100)
committerpierre <ratinaud@univ-tlse2.fr>
Mon, 28 Jan 2013 23:18:43 +0000 (00:18 +0100)

Trivial merge