Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 29 Oct 2014 15:12:15 +0000 (16:12 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 29 Oct 2014 15:12:15 +0000 (16:12 +0100)
commit5a690e87a71059403fe3872a5a11b437f22f0438
tree0aa58a716520b8f2cb228655124240e59e4e3663
parent2ab33522a6a0799cb9aaf9a663e3b91a5e4fa2ac
parentfce39be95fe05bccd1d6b6435451f663df728e97
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab