Merge branch 'master' of 192.168.0.2:/home/pouns/iramuteqNG
authorPierre <ratinaud@univ-tlse2.fr>
Sun, 10 Jun 2012 08:17:44 +0000 (10:17 +0200)
committerPierre <ratinaud@univ-tlse2.fr>
Sun, 10 Jun 2012 08:17:44 +0000 (10:17 +0200)

Trivial merge