Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 23 Jul 2014 09:48:35 +0000 (11:48 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 23 Jul 2014 09:48:35 +0000 (11:48 +0200)
commit061268fd3e0580f0a5bb098e77da3cccfb68ef3c
treee86bc89d636e87846a62b3b7aa84a87c2ee7090f
parenta2d77e198ac3df2e91b8d75c631432b4beecb23b
parent4c816d078c86df38a508225f8bd09f7abf597832
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab