Merge remote-tracking branch 'origin/erp5'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 26 Sep 2012 12:27:06 +0000 (14:27 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 26 Sep 2012 12:27:06 +0000 (14:27 +0200)
commitbda7b9c130a687fc47cd5264ebf3cbad0ad78e8b
tree7ef8248094eed121e04717acbab919918215275a
parent2951c2db8a2446ca5b8ff802abf41388f27e5618
parent47daf858f10599e4e1d7b00781cea7a8e6be6fd2
Merge remote-tracking branch 'origin/erp5'
setup.py
slapos/recipe/haproxy/__init__.py
stack/slapos.cfg