Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 14 Mar 2014 09:16:12 +0000 (10:16 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 14 Mar 2014 09:16:12 +0000 (10:16 +0100)
commit57fff026c128e547753a9b2be73d41973da3a43a
treee6413feaeeae91071aa00798659cda5ed9a7a6d9
parentc2b5180ab7a8b2455ef8be13a33571b161d2b94d
parente0ae89999e4212295b0ecdcf620b6cc51c7a9568
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg