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

Trivial merge