Merge branch 'erp5'
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 24 May 2013 07:34:55 +0000 (09:34 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 24 May 2013 07:34:55 +0000 (09:34 +0200)
commit248e6a2609304c36f0d0aa2deda87ac259d2e557
tree45592f0bc2497dbd53fa0b13eece52bd921beb6a
parent7ba3a92d19efb92b0bc6c7ca22bf7f594f2bb9d3
parent826f6935c09ed5f2ad652964c8ea8dd80c2f1ad4
Merge branch 'erp5'