Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 22 Jul 2014 15:53:12 +0000 (00:53 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 22 Jul 2014 15:53:12 +0000 (00:53 +0900)
commitb80c72ff60bfe0bdf91cfc498481834ddc2ce426
tree75ead85120da975475d3fb24e0e26dcb75142037
parent5156804248130c3d81fc82032077aac8a9982576
parent882ee66aee186df4824110c0b0f42e4509049099
Merge branch 'erp5-component' into erp5