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

Trivial merge