Merge remote-tracking branch 'origin/erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 17 Sep 2012 09:01:11 +0000 (11:01 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 17 Sep 2012 09:01:11 +0000 (11:01 +0200)
commitb2da7092e686b11a74a786d6b63ccb2f7e638e57
tree27cbe0a152095ff84884cc055896ae167657fa30
parent549b23dc84a9faaa5594b402ee267080ad3f7929
parent636a256062fc1ab48e9dd3caeadaf617a7203d41
Merge remote-tracking branch 'origin/erp5-component' into erp5