Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 6 Jan 2015 14:31:00 +0000 (15:31 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 6 Jan 2015 14:31:00 +0000 (15:31 +0100)
commit2b14f57d4e4dba4eed8e1a495194b85bd84b1915
treecefc0ae4c25dfdc151763b97dd9f04e0b6d2fd4b
parente950c3f3208648fab672a254b57710f4a7c3f77c
parent6f3b594f6003a388a3a746e9aac32107d2567fb6
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab