Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 25 Mar 2014 16:58:44 +0000 (17:58 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 25 Mar 2014 16:58:44 +0000 (17:58 +0100)
commit6b18097c8867ce4c5b7388e527926fd3054c3e64
treed2b3961a581828dcf173a57344f407830e4915dc
parent628919d89e98c72fc4ca73af2d99866d00e49b0e
parent2084bfaa9d0a7a3200dc24a7cdef8faa142f38bf
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab