Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorPierre Vigreux <root@Portable>
Mon, 14 Apr 2014 14:45:53 +0000 (16:45 +0200)
committerPierre Vigreux <root@Portable>
Mon, 14 Apr 2014 14:45:53 +0000 (16:45 +0200)
commit02fa4822888c7c43cf6fd75ab6740ec5fac40cb7
treef575d6609fa6ccbf2f6d1d5bfb8b28cf817503ef
parentb44511c019ca5557fc1f0c724deffff80f1cc7e1
parente3dab30378723e9ccb5dcc66fdc1db3d7389a627
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab