Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 8 Apr 2014 08:28:13 +0000 (10:28 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 8 Apr 2014 08:28:13 +0000 (10:28 +0200)
commit4721c89ba35bb6d15db01c70aaccaa5fa177d227
tree6635820b7f6a87ffa025c32bd5586a634b17ca71
parent9ad59e62d3bcb34c98bd29f5b78e8f99146733c3
parente3fb07fa1403308b46608e79837a08d400f1f12e
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg