Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 5 Jan 2015 16:43:29 +0000 (17:43 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 5 Jan 2015 16:43:29 +0000 (17:43 +0100)

Trivial merge