Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 19 May 2014 16:28:24 +0000 (18:28 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 19 May 2014 16:28:24 +0000 (18:28 +0200)
commit56b3be0c907771e3330a2779bde66eb94d05eab4
treeb2e3a9ad4378c6712b2d5512d263407b49cb4522
parent8910af9da68da64429bd44aabbfafb8b128e76cd
parente801b7b02dfe2c84eb879bc5d4d124f7da2129a2
Merge branch 'erp5-component' into erp5