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

Trivial merge