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

Trivial merge