Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 24 May 2013 07:33:33 +0000 (09:33 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 24 May 2013 07:33:33 +0000 (09:33 +0200)
commit826f6935c09ed5f2ad652964c8ea8dd80c2f1ad4
treee8eccb7060d916c7f8c647f2c7857299b60a9df7
parent5cec95703bf4bf2bce27c49b17a9d812e1c88fd3
parent5d5a7a53c3b694a9839bc8d4aec4da27a0629da2
Merge branch 'erp5-component' into erp5