Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 28 Apr 2015 14:44:46 +0000 (16:44 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 28 Apr 2015 14:44:46 +0000 (16:44 +0200)
commit00446adb7d1cd10387002c24cf1fa267fe655d28
tree12a783fc5ca30f2d2f0df34b731e4ec8f22406b0
parentcf0d90125ee5ee265e2eea3cb945f9d49964a5e6
parent8adb4f97263a66a2a2cf151cf8d3ab5569d365f3
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab