Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <root@lamia.ipv6.lip6.fr>
Thu, 5 Jun 2014 13:46:31 +0000 (08:46 -0500)
committerYasin <root@lamia.ipv6.lip6.fr>
Thu, 5 Jun 2014 13:46:31 +0000 (08:46 -0500)

Trivial merge