Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 21 Feb 2014 11:46:01 +0000 (12:46 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 21 Feb 2014 11:46:01 +0000 (12:46 +0100)

Trivial merge