Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 11 Jul 2013 06:26:30 +0000 (15:26 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 11 Jul 2013 06:26:30 +0000 (15:26 +0900)
commitdd97008d32aaa1d1dda459e9282d1cb71ee3a594
tree456e160f6d44fc6775898fec523a08f342840420
parent5cf88bafe16ae2e1ee75ffadd1b6428e3bb7cf28
parent5ff5acd9f206aed220194cd8f049128e684df623
Merge branch 'erp5' into erp5-z2.13