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

Trivial merge