Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 14 Mar 2014 10:43:05 +0000 (11:43 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 14 Mar 2014 10:43:05 +0000 (11:43 +0100)
commitf315c56cca72427a141b9e0d858f4ca7cfff2108
treebc3ed4cc789f31f4106cde5c44af388685d7f9f4
parent57fff026c128e547753a9b2be73d41973da3a43a
parent2a87d7de402238b0c97d72a7231cfe331149f4b6
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg