Merge branch 'master' into tvl1_ali
authorErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Thu, 3 Jul 2014 13:30:59 +0000 (15:30 +0200)
committerErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Thu, 3 Jul 2014 13:30:59 +0000 (15:30 +0200)

Trivial merge