Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 19 May 2014 12:23:39 +0000 (14:23 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 19 May 2014 12:23:39 +0000 (14:23 +0200)
commit8910af9da68da64429bd44aabbfafb8b128e76cd
treece510044387e6bc4e4ee09ffe5940769bda9b403
parent3365305c3aaca1f85f8ba5f167137f924ac35ab0
parentd8a5f06cb83f8942c103323e6e6478254c4f5bd6
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg