Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 Jan 2014 13:30:22 +0000 (14:30 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 Jan 2014 13:30:22 +0000 (14:30 +0100)
commitc9694c5b4e99ec858074243351b6bc0314df3dcf
treef40e63a7ed7f86178f73b503b9baa830ab4fe08e
parentd0bce1036b2c316857a6a1abcacdda4d6bc10e30
parent7be607316f7b1682f7e99a09b6df548dec3fc4b2
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg