Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 24 Jun 2014 13:56:40 +0000 (15:56 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 24 Jun 2014 13:56:40 +0000 (15:56 +0200)

Trivial merge