Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Mon, 3 Mar 2014 12:56:23 +0000 (13:56 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Mon, 3 Mar 2014 12:56:23 +0000 (13:56 +0100)
commit0b60230d917ba602cdc5eac89e36b6f046b21618
tree9e0494ce43c0f1bddc77d89b956a25742dbc038d
parentd251934bd71c678f552dc9a1d49c3f8efe102e1e
parent688e9e5551a6e18f3f0f3df1fe93eaf7ed77d238
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab