Merge branch 'erp5-component' into erp5 slapos-0.229
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Jul 2014 09:37:00 +0000 (11:37 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Jul 2014 09:37:00 +0000 (11:37 +0200)
commitfb9fe39f52dc28d62fb322d49d7ff3ab067b7e03
treee7a22e4a9844d884230f6f1473c3d58643e206b8
parentc4f5ca68af31cd9d8461869d70928c33a03c5aa6
parent58c437118eaddf44d1f80aac8c0efec538d93cfb
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg