Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 19 Jun 2015 13:46:40 +0000 (15:46 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 19 Jun 2015 13:46:40 +0000 (15:46 +0200)
commit3a5bc6f4aae88b2beb9ac09cd71c96bf6da08574
treedc98ad141e81e2cb0437b0ef95e9c416532c4725
parent89029dbe3f25c910364f26852ace08a8979c8cbf
parentc2cea59fa10426fb874551ce612d54c4204048cc
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab