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)
commit6594d52185b95e6b87e7de03cdbb7253c8f7a027
treefb5b2b85414d88e3f95488aade1ef54a9ef6d3d8
parent7b8bb4248b20f65e2c2e0367da3cce9579e1b9dd
parent345b69d5f7319e639481da5188164dcca1c237e3
Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle