Merge branch 'erp5' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 4 Apr 2013 14:41:17 +0000 (16:41 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 4 Apr 2013 14:41:17 +0000 (16:41 +0200)
commit411973ac5f75944fade795bd2356c73d338e9563
tree513f1d481c5b282bfa2b25138d8b93ee59e90ffa
parent43638852910f737ccf93d6112d2d4a2c3ccaafe4
parent9efa1ae1ee718822a50d8e3505aa5c274ee2f0d9
Merge branch 'erp5' into erp5-component
stack/erp5/buildout.cfg