Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 30 Jul 2014 15:30:02 +0000 (17:30 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 30 Jul 2014 15:30:02 +0000 (17:30 +0200)

Trivial merge