Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Mar 2013 23:16:12 +0000 (00:16 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Mar 2013 23:16:12 +0000 (00:16 +0100)
commit33d9e196c722d063b23b648b34717e2d196f2eca
tree52ccae06712655f2bc7cf02447ff5748bed95fdf
parent2879a56c1c2d009391b7851e74ab37a7efbc75d3
parentd9025faf126110ec900a95c396dfc11aa51cc5b4
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg