Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 11 Jul 2013 06:26:24 +0000 (15:26 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 11 Jul 2013 06:26:24 +0000 (15:26 +0900)
commit5ff5acd9f206aed220194cd8f049128e684df623
tree15206dac1d320f730793e6a0e0f6d6e7b0e5e34a
parent2a2f864b8f905732b5b3ab29d6c62ead34d16ccd
parent4faaff13c685ef0896b111909277ab28d6c6ae36
Merge branch 'erp5-component' into erp5