Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 2 Dec 2014 14:46:46 +0000 (15:46 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 2 Dec 2014 14:46:46 +0000 (15:46 +0100)
commit6032c2b38c3885f3f0f1d139fb8ddba88a929c18
treed332a3693c3fa4c134230224d37766efba5c86b1
parent942e4d7597ac78a506cca5b62c1832dbaae8a72e
parent3b39e97b04f9333fd58978120f00c1b4ffffbc41
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab