Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 17 Dec 2014 16:21:08 +0000 (17:21 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 17 Dec 2014 16:21:08 +0000 (17:21 +0100)
commit472a1ed07124ac7df43c71024c17ec72362486d8
treedb6b1d1545715af847fe96ca86ed72c95c95eb98
parent7bd68468a99af3699d2565447bb067f0d9708f75
parent22ef84b02c0cbaa741bad1b1fbb04c5a2e93b3de
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab