Merge remote-tracking branch 'origin/erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 12 Jun 2012 08:25:59 +0000 (10:25 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 12 Jun 2012 08:25:59 +0000 (10:25 +0200)
commitc9ce69f67b80eb5ff47e55c18d9f63232f63f968
tree7aa91805e80673aa7ee651dbc98102d316f5e5c6
parentc22ca954304b9dfbebe857e3b8a9bdd8f990d5a7
parent263ebb0df7a9d6e6fdb799e6fb7c0e8d8d9576e4
Merge remote-tracking branch 'origin/erp5-component' into erp5
software/erp5/software.cfg
stack/erp5.cfg