setup.py · c6762ab07c410f2b9301567d020e4dcef885c2bb · nexedi / slapos

Merge branch 'master' into erp5-component · 321fcea0

Cédric de Saint Martin authored Jun 27, 2012

Conflicts:
	component/apache-php/buildout.cfg
	component/git/buildout.cfg
	component/mariadb/buildout.cfg
	slapos/recipe/request.py
	software/drupal/instance.cfg
	stack/lamp/buildout.cfg
	stack/nbd.cfg

321fcea0

Replace setup.py