Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <root@lamia.ipv6.lip6.fr>
Tue, 10 Jun 2014 16:07:43 +0000 (11:07 -0500)
committerYasin <root@lamia.ipv6.lip6.fr>
Tue, 10 Jun 2014 16:07:43 +0000 (11:07 -0500)
commit6e8f0dd20d7bc7fd5edec2746f4c150a2597924c
tree2314bd2764b73effbd3beba6c1a0994e326b8c16
parentfe44e41f6699681b3426d10377568428c7264293
parent2378754e87e0c91d9c213186d8ff36c1810921dc
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab