Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 6 May 2014 16:20:16 +0000 (18:20 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 6 May 2014 16:20:16 +0000 (18:20 +0200)
commit303e761d924ec5491f28039a6e06433d269b051e
treeb1581ef3451eb671359982bf63d059c4f1898b15
parent47e44bc61b088033691c43be4609e8c4248b2cb8
parent0b7336baf3ddaf5c18285556344e2afa9907a7f7
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab