Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 6 Sep 2013 15:24:25 +0000 (17:24 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 6 Sep 2013 15:24:25 +0000 (17:24 +0200)
commit58c7f8119c916a8f50e85c4f880a8e11d8289437
tree8302b2ec0ebd31ad616b60bda3536191fbb1b118
parent572f5fd517f08837e9d01744c02b1ad8955f4760
parent041b91e9a9083049cac1f36c7ac1b7d08a1d3224
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan