Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 21 Feb 2014 13:32:20 +0000 (14:32 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 21 Feb 2014 13:32:20 +0000 (14:32 +0100)
commit2e2f6e22bf35363b4bc6485ed67e0c114b446222
tree92192fd9efadca489bc6859ec4fa657930c79985
parent48759e302cac75bf63a1e156603c29e96b704b13
parent889940423bb78ddb3292548bc466c71a3214e0df
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab