Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 26 Aug 2014 14:18:48 +0000 (16:18 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 26 Aug 2014 14:18:48 +0000 (16:18 +0200)

Trivial merge