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

Trivial merge