Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 5 Dec 2013 09:24:58 +0000 (10:24 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 5 Dec 2013 09:24:58 +0000 (10:24 +0100)
commit298ba8852cadcf8293eaf000850d1f1a46267bc3
tree5689c3eeec8c76f18be5edc39dec8ff85fe31b7b
parentfcf5ea9623385c55cee73f76d1c6667c44345b5c
parent1cd2c3a91981af44d9756d2c27ed360ea78f3e37
Merge branch 'erp5-component' into erp5