Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 4 Mar 2014 09:36:50 +0000 (10:36 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 4 Mar 2014 09:36:50 +0000 (10:36 +0100)

Trivial merge