Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sun, 12 May 2013 15:12:46 +0000 (17:12 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sun, 12 May 2013 15:12:46 +0000 (17:12 +0200)
commitb6bad720d9983df62925174298f50803649c22ad
treec8737fb252384c27d3820d1edd7dd69484f1db1c
parent561ffa4842d3ec6911eb676aa54b8fa705a09957
parentcc55bfa923ef407f802278ffd86b27081db45bd0
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg