Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 12 May 2014 15:12:47 +0000 (17:12 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 12 May 2014 15:12:47 +0000 (17:12 +0200)
commit662564e050f6db5bc664223634e9b3780e89ed50
treeeeb8292b8f25b81a974261cd4d9affd0a25e8e59
parent7830ebbd8c1e8190c0fd5c89174620e4b711839d
parent89d45304fdd793e6d5632565ad74e14074610a35
Merge branch 'erp5-component' into erp5