Merge branch 'master' into erp5-component
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 26 Sep 2012 12:48:56 +0000 (14:48 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 26 Sep 2012 12:48:56 +0000 (14:48 +0200)
commitb4d79cad4d60c76c0538060e39dcca946b5212b9
tree9bc82ae4f33bb72e40ef221618c698279fba95e3
parentb16ace6b6406d010e6b920bf6c286cb1f9707d0f
parent2951c2db8a2446ca5b8ff802abf41388f27e5618
Merge branch 'master' into erp5-component

setup.py has been sorted alphabetically prior the merge.

Conflicts:
component/slapos/buildout.cfg
setup.py
stack/slapos.cfg
component/slapos/buildout.cfg
setup.py
slapos/recipe/haproxy/__init__.py
stack/erp5/buildout.cfg
stack/slapos.cfg