Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 5 Sep 2013 14:23:01 +0000 (16:23 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 5 Sep 2013 14:23:01 +0000 (16:23 +0200)
commit67f6ffe4742ada4c7243b528891289304fc4016d
treea9d75d860ea3aa078576a32d4fc3c121ee81db25
parent66846b948b78e03a36bc88a26441ec78f7ad92c2
parent49f0381d60a23cd5b0bf546e97b0b5652de81b14
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan