Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 2 Sep 2013 16:04:38 +0000 (18:04 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 2 Sep 2013 16:04:38 +0000 (18:04 +0200)
commitfd97f2a187b8003f9bb532d7d84a332411e62f3e
tree53057c6477f01b0acc2c82739ed2436eee83602b
parentf1710859f641c0b74029e6acaaba3c2d2d471108
parent814c26b7693c50f9bb2a4e52e3000d9b8cc2ab80
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan