Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Feb 2014 08:46:25 +0000 (09:46 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Feb 2014 08:46:25 +0000 (09:46 +0100)
commit22db977298fc798e42bd042bde398b63feffbe0f
tree6bb9671535999a9d8bc5122f5e1bab93538d6ebe
parentc9694c5b4e99ec858074243351b6bc0314df3dcf
parent5859e9e600e6e689f5d2f02b6687f3df781b1df9
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg