Merge remote-tracking branch 'origin/erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 17 Sep 2012 08:03:42 +0000 (10:03 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 17 Sep 2012 08:03:42 +0000 (10:03 +0200)
commitab98bfa50c848212f79ec303e85d43c44d17b9c8
tree523dca2e18f8b12e4dfa60c449720988ecc8ca48
parent629a26ff35816adc2fdb42229fa418b5befd742b
parentb7c111de437a3e66fdc315009f4d92ff042ed8c6
Merge remote-tracking branch 'origin/erp5-component' into erp5