Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Feb 2013 08:16:07 +0000 (09:16 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Feb 2013 08:16:07 +0000 (09:16 +0100)
commitafa89a95cc489f66da6e2d3ed4763db9ab6a42bc
treeeff04bb325c2602f4174c6c114501c6a1c16fc9c
parentf085ff9c70836f1e4c92f29aad19eba0798cf939
parenta58db33a368c76852b0686c23bf6d0f13365e1be
Merge branch 'erp5-component' into erp5