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

Trivial merge