Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 5 Dec 2014 18:20:49 +0000 (19:20 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 5 Dec 2014 18:20:49 +0000 (19:20 +0100)
commit459533cb225580b6e9e58136fa81f5470537e7d0
tree9ea6752a71fb98921ddcc8f7512a1d383cf419ec
parent8de32d59ac55a00c6fb65d34bc74f72fc9d606ec
parent73443993684db0b467e3ae45a847bb729b608907
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab