Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 8 Apr 2015 16:02:49 +0000 (18:02 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 8 Apr 2015 16:02:49 +0000 (18:02 +0200)
commit36a055e3ebf502b2c9b3103e617e1817da7bcd8e
treec2508e6457ace59dbdee37c726597da87e462085
parent7ab4b86ad8c61b3e7119e2d54bd5cfa14dcc92f7
parentf75124b277498b3d4ea090d8f6d59c681d6f4163
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab