Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 21 Jan 2015 14:37:05 +0000 (15:37 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 21 Jan 2015 14:37:05 +0000 (15:37 +0100)
commitac575fb40a8a128cdac22bdc0b868012011c5e66
tree3e8a258feed35fe42fc539a4af6f18507680b0ee
parentbc4a0bc510121f893be6b7c0d28168f9bc48149d
parentb03df72aa08f5af684c998e5d8b2f32fb6b6fbe9
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab