Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 30 Apr 2013 07:28:35 +0000 (09:28 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 30 Apr 2013 07:28:35 +0000 (09:28 +0200)
commitbb6746ed94e4dffe2ba5223632793ea3a9d3b33f
tree2d4a85adbcdc49f0505f0eb3d285d39a5baa7321
parentd48aa7e7dd7092e4b6a385dab6fabe16fa08444e
parent87d0d1aafedbabed8cb29bade39ed0c71e72ffe5
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg