Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 19 Mar 2014 10:30:58 +0000 (11:30 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 19 Mar 2014 10:30:58 +0000 (11:30 +0100)
commit7c2e9c7a6736389773ed91d123819b9f2e2256b5
treeec675271149271e4f5c1b86bfc55fe38d5b0a6bc
parentf315c56cca72427a141b9e0d858f4ca7cfff2108
parent89c62040ec633c386262ddc3c61d9c468f12a079
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg