Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorciro <ciro.scognamiglio@lip6.fr>
Tue, 21 Apr 2015 15:36:54 +0000 (17:36 +0200)
committerciro <ciro.scognamiglio@lip6.fr>
Tue, 21 Apr 2015 15:36:54 +0000 (17:36 +0200)
commit9411399e9215852c3bcfdf708f9a9d984596f496
tree289647627bd7493f027b8ae2b290937c4cc010aa
parentad016322ae3f21b27cda0e942fa48a10c3c728a3
parentd6ef306dd96a5b12b538baed4d5a312a8ca2ec1a
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab