Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 7 Jul 2014 15:03:50 +0000 (17:03 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 7 Jul 2014 15:03:50 +0000 (17:03 +0200)

Trivial merge