Merge remote-tracking branch 'origin/erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sun, 10 Jun 2012 19:20:30 +0000 (21:20 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sun, 10 Jun 2012 19:20:30 +0000 (21:20 +0200)
commitba5da9ecec663adc43b22be4ecd12a3850e699cf
tree24da90db23ef9c1a4793a05134dc90ab7bfb52ac
parentfe471853b5f5a7bc4e8b58aec2ac9264282a37ed
parentb2f94b7dbc5ce581a10b3038d5959bb496045e85
Merge remote-tracking branch 'origin/erp5-component' into erp5