• Rafael Monnerat's avatar
    Merge branch 'master' into apache · f6bccece
    Rafael Monnerat authored
    Conflicts:
    	CHANGES.txt
    	component/slapos/buildout.cfg
    	setup.py
    	slapos/recipe/kumofs/__init__.py
    	slapos/recipe/memcached/__init__.py
    	slapos/recipe/mysql/__init__.py
    	software/kumofs/software.cfg
    	software/mysql-5.1/software.cfg
    f6bccece
setup.py 2.89 KB