Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sun, 29 Dec 2013 23:01:39 +0000 (00:01 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sun, 29 Dec 2013 23:01:39 +0000 (00:01 +0100)
commit01a467f4c725baa4d8d827a4e28fe1e6778d6e44
tree2a2353e03a3981a20649fb1c82da4b17b090c379
parent60f4e22d28fe8e651b9dcbd092548e2679d2b048
parentc2db37dbfbbd7b7b98198b7b3758cb5e9d3f5d57
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg