Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 2 Sep 2013 16:39:31 +0000 (18:39 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 2 Sep 2013 16:39:31 +0000 (18:39 +0200)
commit55cc385f1daa4de9eac8afd3ae74ba2195163dec
treee6e8e1da01eb2d15f4e93bb0f1cbaac1809fe56f
parent208404a2dc21c6f9c083820df5117fa02fdef7ba
parent1755b9733f085571d510056527290b06168c03ef
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan