Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 23 Jul 2014 20:26:14 +0000 (22:26 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 23 Jul 2014 20:26:14 +0000 (22:26 +0200)
commit701f28f114ad3bcf4c145420f294da5597a88390
tree77d66d3bb728701410378fe99358f84fbde3a887
parenta64a773ab4c1c885221fb0b71372b5da8b44dbd5
parent85ce18fa05ed8b4a043ae2605b6468aa2f2d7aae
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab