Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 08:37:33 +0000 (09:37 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 08:37:33 +0000 (09:37 +0100)
commitd98c8aef8762ef50c7cef389ec467320ada56bc2
treedf9b5e3fe0dbc377b40939f16577b044dc95052a
parent9e672906538fe870a26375180d2c11ad7539b620
parent45ae3c3bc20b630b4a70685c7da38563c3127da5
Merge branch 'erp5-component' into erp5