Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 8 Apr 2014 17:27:26 +0000 (19:27 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 8 Apr 2014 17:27:26 +0000 (19:27 +0200)

Trivial merge