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

Trivial merge