Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 1 Jul 2014 12:10:52 +0000 (14:10 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 1 Jul 2014 12:10:52 +0000 (14:10 +0200)

Trivial merge