Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle
authorErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Fri, 1 Aug 2014 12:54:55 +0000 (14:54 +0200)
committerErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Fri, 1 Aug 2014 12:54:55 +0000 (14:54 +0200)

Trivial merge