Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 28 Mar 2014 14:55:53 +0000 (15:55 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 28 Mar 2014 14:55:53 +0000 (15:55 +0100)
commit8cbb4a7c75dc0f0c5972b4f915531d3ac9d024d2
tree32f394d816308e7351cc2c936ead0d44847e2637
parent8c4194ead0952c7d668fc84199cdf7fa6e682c24
parentda17fe7899f53aa7eb0a2d979d99eff659f5d5aa
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab