Merge remote-tracking branch 'origin/erp5-component' into erp5-component-merge
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 15 Jan 2013 17:14:36 +0000 (18:14 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 15 Jan 2013 17:14:36 +0000 (18:14 +0100)
commit427065a719166ec979dfff7217031f117135e091
tree30097a31ade278b1a01c67b743e8692c2a6be991
parent8cf7bf6ef5e6c2375a1dabda5d912b04547576b3
parent1e7c3f27c23789045695ff0fa203586385977544
Merge remote-tracking branch 'origin/erp5-component' into erp5-component-merge