Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 9 May 2014 08:59:24 +0000 (10:59 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 9 May 2014 08:59:24 +0000 (10:59 +0200)
commit130bfbf9d4ec4eefa9ed9e8b427ad6e0ed3298a0
treeabb71b644ed70b15d985f136a4d2abd1a85cb065
parent906dd9d83ee9d5e0f5f3c0cde7b5bac81ae967f5
parent63c116178b37fa0e29463541071d37c61dc8ea3a
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg