Merge branch 'erp5' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 Jan 2014 13:31:10 +0000 (14:31 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 Jan 2014 13:31:10 +0000 (14:31 +0100)
commitb7cccaaeff45c8e6b4e7a523179b039d0be515e0
tree9b1585d9788d8ff2260a5ff274dbda9a0e6477d1
parent2add6e19390e6833e3cc893471ad09e3e9564cc8
parentc9694c5b4e99ec858074243351b6bc0314df3dcf
Merge branch 'erp5' into erp5-cluster
stack/erp5/buildout.cfg