Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 15 Apr 2015 15:29:53 +0000 (17:29 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 15 Apr 2015 15:29:53 +0000 (17:29 +0200)
commit96155eedb29b2afab0d340e8b449050cf9fbd627
treedee13a837ff0856c89b9b1acc173b04598f9150c
parentbe3d9cf2385c596484f5dfd3f7ee795bc4cb3a15
parentd740d228d416514bf7aeeb5c6ff67339e34748ee
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab