Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 21 Feb 2014 13:15:03 +0000 (14:15 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 21 Feb 2014 13:15:03 +0000 (14:15 +0100)
commit03dfe4e173d4ff67c821e29e36e5b872c533a4f2
treed166817fa7bc433204596cb4482ca63e50b37da6
parentca288746c74cc07f45de29f111cba830c21eb841
parent2723f74db5e910fb83aa90d22042ec9ec5bdec38
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab