Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Mon, 21 Jul 2014 08:58:01 +0000 (10:58 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Mon, 21 Jul 2014 08:58:01 +0000 (10:58 +0200)
commit06be272232c9f387a12ad10ee87f798720bb6938
treea7bd6b5f7c21c642090e07a013c5675a307afb02
parent1a6b4f8d82c0ac2fbd16df20a2d851fa3359b5eb
parent12e7d0096c803ae8d72687c049b07b3676e0b1d2
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab