-
Cédric de Saint Martin authored
setup.py has been sorted alphabetically prior the merge. Conflicts: component/slapos/buildout.cfg setup.py stack/slapos.cfg
b4d79cad
setup.py has been sorted alphabetically prior the merge. Conflicts: component/slapos/buildout.cfg setup.py stack/slapos.cfg