Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 24 Jul 2014 09:29:40 +0000 (11:29 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 24 Jul 2014 09:29:40 +0000 (11:29 +0200)

Trivial merge