Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 6 Aug 2014 09:37:26 +0000 (11:37 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 6 Aug 2014 09:37:26 +0000 (11:37 +0200)
commitc5ce008763e2e921336b22c390b0077b339a1bfe
tree0fe1fc9a09364bd78ab6200ec1ae7de4bc99dbf8
parent754158ae8e3a6b8e1d5cfeed23de32e4ad941a29
parent4ad6b9d025e7dd31df32cf9f187e6b29287750bd
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab