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

Trivial merge