Merge branch 'erp5-component-merge' into erp5-component
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 29 Jan 2013 16:32:59 +0000 (17:32 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 29 Jan 2013 16:32:59 +0000 (17:32 +0100)
commit941146b1d14daab94e7185f4d73e2ad2fb5fb879
tree789f001dd46ed7084e15aca1a7e3e172b3ef4547
parentca1b1dad24ce0d45b8cfc5c226897c91d6b4cf72
parentd4495ab7e0fe2270bcebd47bd2fea91e53a3b7d2
Merge branch 'erp5-component-merge' into erp5-component
setup.py
slapos/recipe/symbolic_link.py
stack/erp5/buildout.cfg