Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 26 Jun 2015 10:46:32 +0000 (12:46 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 26 Jun 2015 10:46:32 +0000 (12:46 +0200)
commitdc678d8906741d5fe601c0513c29fa4f15f45c01
tree0133e67d87eccfe5d7d464425e491435f4da2a81
parent638bef2312f862f8e148c9ad5a4675316c1ca961
parent3fb07f8fde0f7970ffa3d80e2866f7d6220cf29e
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab