Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 17 Dec 2014 15:03:34 +0000 (16:03 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 17 Dec 2014 15:03:34 +0000 (16:03 +0100)

Trivial merge