Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 28 Mar 2014 18:38:19 +0000 (19:38 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 28 Mar 2014 18:38:19 +0000 (19:38 +0100)
commit75fe47c33c066bdac49d2dc2315aec57309c3cdb
tree1c04a330db7fac74f65be2c57285c35bb144e99e
parent1ddfdc56b0611c9af2e2659084f0a98328783a67
parent2ad07f49efa34f2eea61ab27d9bc17cb4b0e1836
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab