Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 1 Sep 2014 12:32:30 +0000 (14:32 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 1 Sep 2014 12:32:30 +0000 (14:32 +0200)
commit2a9dee0af498110faec36675bbd08c84e02b479c
treeae611dafa75d2fdec39bee38d2ed2c59fd4b2144
parent51b5091377a5ab076393d48d7815faa3db623f9b
parent22817efbae41e9d59f07f1e61f3d5f05f1193897
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab