Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 22:11:28 +0000 (23:11 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 22:11:28 +0000 (23:11 +0100)
commit8a7291cf4f934a6a63bb671451553f7a4c53b6d4
tree0649a18079905218cd30c59cc3aab0212837ca8a
parentd98c8aef8762ef50c7cef389ec467320ada56bc2
parent8ffe979105ba949e2505ddc08cd6510f80e9a408
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg