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

Trivial merge