Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <root@lamia.ipv6.lip6.fr>
Tue, 10 Jun 2014 16:23:08 +0000 (11:23 -0500)
committerYasin <root@lamia.ipv6.lip6.fr>
Tue, 10 Jun 2014 16:23:08 +0000 (11:23 -0500)
commit1596038cb19b313eb8b6853243f800dce93b9831
tree01fe70c7d0116f6c54f7eb3e87d6822b71d7789c
parent6e8f0dd20d7bc7fd5edec2746f4c150a2597924c
parentb98197893ceec1ba76086b94f0a319dbae96476c
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab