Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Apr 2014 12:20:23 +0000 (14:20 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 3 Apr 2014 12:20:23 +0000 (14:20 +0200)
commitf6a391f2e53ffba3d536db2f93f9cbdea8a0195f
tree669911def4b69f1d550f7fa0e798cfd1854d7530
parent28b6456a0a8d949f5083a03f60103dbe41f3aa65
parent3355e7436e6c668eef90b1d3f4ad2268d735a288
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg