Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <root@lamia.ipv6.lip6.fr>
Fri, 6 Jun 2014 15:46:11 +0000 (10:46 -0500)
committerYasin <root@lamia.ipv6.lip6.fr>
Fri, 6 Jun 2014 15:46:11 +0000 (10:46 -0500)
commitfe44e41f6699681b3426d10377568428c7264293
treecc9cb365c430dc78637b1b9d4f20361be6d8ed74
parent51b38081d2a5dca8a2760e6b195f4f53bbec1366
parent13aebd01514329394c6663834c3dc473ddb969a6
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab