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

Trivial merge