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)

Trivial merge