Merge branch 'master' into erp5-component
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 11 Jan 2013 16:03:15 +0000 (17:03 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 11 Jan 2013 16:03:15 +0000 (17:03 +0100)
commit6430a8fd66905544a5176f44021728fec62ada29
tree12bd287b19d61870195d42a76e59026ce96abe2b
parent2d95f58ee642b9be971abeb62675dde0b22e8d81
parentc42de3f4675ddf16017876284f76ef767c3e8b8d
Merge branch 'master' into erp5-component

Conflicts:
component/rpm2cpio/buildout.cfg
component/slapos/buildout.cfg
setup.py
slapos/recipe/6tunnel/__init__.py
slapos/recipe/request.py
stack/slapos.cfg
component/pkgconfig/buildout.cfg
setup.py
slapos/recipe/librecipe/__init__.py
slapos/recipe/request.py
slapos/recipe/slapconfiguration.py
stack/erp5/buildout.cfg