Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 2 Jul 2013 21:04:48 +0000 (23:04 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 2 Jul 2013 21:04:48 +0000 (23:04 +0200)
commit9b7b0aa7809244ba8de45512d13da0802df5e165
treec70ee12735270c3fc11a6e527ec8caed0a358b20
parentc04bdf35070d6f06b3f9d002ea8eb370c6613ecb
parent13a81682928ac1a0e43a629ec0465a6775992fd4
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg