Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Thu, 24 Jul 2014 21:12:21 +0000 (23:12 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Thu, 24 Jul 2014 21:12:21 +0000 (23:12 +0200)
commit87d78646979a54137f613f94b080014af7ab8f66
treed0088936f0420fd6440a6950a556852fb70cafbd
parent1a17fe1834728dff6210388a9bda42dd20469242
parent7e8b243ba01f6ee786c44cf71a01963f936f67ea
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab