Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 5 Jun 2014 13:09:54 +0000 (15:09 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 5 Jun 2014 13:09:54 +0000 (15:09 +0200)
commita968cf61c4c7bc122108fb37fac8cdc111f466e6
tree8b7f11de8b3a7ed77198d9ad0061ffc50605c9e1
parente6da36658fb9bce878dd7f9e22694e8dccd04bb4
parentbdb6a3e86a1c998036f88dae5fb7ea1ab3bdd913
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab