Merge branch 'master' into apache
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 15 Nov 2011 11:01:46 +0000 (12:01 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 15 Nov 2011 11:01:46 +0000 (12:01 +0100)
commit69736dbf65688bff0737679895ab67fe7aa351a8
tree1f8453ab5124e8b5fc1f584c7f7449d96be63a71
parent6a9bfb40df7c2e44fe07859cc2dc02c848bb0d68
parent274f6d24cc63e758ba0fc323b3da388197d956f6
Merge branch 'master' into apache

Conflicts:
component/slapos/buildout.cfg
CHANGES.txt
setup.py
stack/cloudooo.cfg