Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 12 Jan 2015 11:31:37 +0000 (12:31 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 12 Jan 2015 11:31:37 +0000 (12:31 +0100)

Trivial merge