Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab myslice-1.3
authorLoic Baron <loic.baron@lip6.fr>
Tue, 28 Apr 2015 12:58:51 +0000 (14:58 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 28 Apr 2015 12:58:51 +0000 (14:58 +0200)
commit8adb4f97263a66a2a2cf151cf8d3ab5569d365f3
tree0b7ac1dcb7339dc4e8cb6031856fdd25f94158e6
parent454aec79b6fb6c59affdea254c929f333ceda7d8
parent6eb98c83dccb555e576740d8000d6fad8044763f
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab