Merge branch 'master' of http://www.netdig.org/git/iramuteq
authorpierre <ratinaud@univ-tlse2.fr>
Wed, 30 Jan 2013 20:01:35 +0000 (21:01 +0100)
committerpierre <ratinaud@univ-tlse2.fr>
Wed, 30 Jan 2013 20:01:35 +0000 (21:01 +0100)

Trivial merge