Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin Rahman <mohammed-yasin.rahman@lip6.fr>
Fri, 27 Feb 2015 15:19:38 +0000 (16:19 +0100)
committerYasin Rahman <mohammed-yasin.rahman@lip6.fr>
Fri, 27 Feb 2015 15:19:38 +0000 (16:19 +0100)

Trivial merge