Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 23 Jan 2014 05:57:46 +0000 (06:57 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 23 Jan 2014 05:57:46 +0000 (06:57 +0100)
commit852f2ddcc9d0e58ee9e3ec34271e4d39686c0a44
tree279a6894b712a0a3f91171d3e13d0f5af108c445
parentd3338d6e4caadbaf86b3a97efa9fd3413654e5de
parentb85542f8d1364e2f18f5c863b1cd383b21328776
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg