Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 10 Oct 2014 16:11:24 +0000 (18:11 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 10 Oct 2014 16:11:24 +0000 (18:11 +0200)

Trivial merge