Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 24 May 2013 07:34:10 +0000 (09:34 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 24 May 2013 07:34:10 +0000 (09:34 +0200)
commit8636f667ee7355389ccfbb1d9d96ac7e76c30100
tree9d07dd735f52a94c35e7e23c8f9c23fb926f9c6b
parent75ebe0005de3bf306a447d4fd70422fc82ec536f
parent826f6935c09ed5f2ad652964c8ea8dd80c2f1ad4
Merge branch 'erp5' into erp5-z2.13