Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 13 Mar 2013 07:15:13 +0000 (08:15 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 13 Mar 2013 07:15:13 +0000 (08:15 +0100)
commitf0153580422c2968f8ce86bc8b4499d89c92f695
tree2b4f215c731ece296d90b79b28003205ed1afe3d
parent33d9e196c722d063b23b648b34717e2d196f2eca
parent8c36253d8db34451d50bee473f9a3669b3a9f36c
Merge branch 'erp5-component' into erp5