Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 21 Apr 2015 09:52:35 +0000 (11:52 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 21 Apr 2015 09:52:35 +0000 (11:52 +0200)
commita8104de58940697d33f0f38cb3c866b7ecf6f4f4
tree1f13f2dd6a467622db5b09c2e74bad4c059f32e2
parentab900a267e55ed6b5fe66c84a6b8072f571474eb
parent26709c1cd29b40ac2e617a075a085e18da35e87c
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab