Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 15 Jan 2015 15:25:32 +0000 (16:25 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 15 Jan 2015 15:25:32 +0000 (16:25 +0100)

Trivial merge