Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 17 Jun 2014 18:41:33 +0000 (20:41 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 17 Jun 2014 18:41:33 +0000 (20:41 +0200)
commite543010acd2a18db15ac67001a0fc53a8ec311d5
tree9cdbff36b585c2e06cd758d0d2c024a8954f2513
parent72a7235a89a47dd08fb15caa55b12b8087c2e934
parent3422b8fa1dbbd3ae235a94c8588b204de51972d7
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg