Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 09:46:54 +0000 (11:46 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 09:46:54 +0000 (11:46 +0200)
commit709057279345072f118a24d86128560f1ea83007
tree583fbaeef20e97dd45eeaa97af9074fda4a4d529
parent826f6935c09ed5f2ad652964c8ea8dd80c2f1ad4
parentfd2a411122acad1b8adf9ff6ed019b57210e7d0d
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg