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

Trivial merge