Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 18 Aug 2014 19:29:54 +0000 (21:29 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 18 Aug 2014 19:29:54 +0000 (21:29 +0200)
commitcf4cdbfa738f4687eae3cab36fdaf4914da1d160
treec95ea48e299c66a3a539af151cdfc638483c181b
parent8f6f52077049744fefcdd4e3d645eca32473914b
parentbff32abff469690c249af3b4f1cbb6905bd70e0d
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab