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

Trivial merge