Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 15 May 2014 12:05:01 +0000 (14:05 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 15 May 2014 12:05:01 +0000 (14:05 +0200)
commit3365305c3aaca1f85f8ba5f167137f924ac35ab0
tree9cfa7a4af3908e5ca1edbd119abfa29cb1de7117
parent662564e050f6db5bc664223634e9b3780e89ed50
parent482759e712346fae87053ddeeb3ad39319a43011
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg