Merge remote-tracking branch 'origin/erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 30 Jun 2012 13:31:08 +0000 (15:31 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 30 Jun 2012 13:31:08 +0000 (15:31 +0200)
commitfb895b16f9c31af0474eb39cde9be5acfd5f6a4a
treef801fe395fce908ef17aaa9eed7753a0239b87f8
parent902b7a46c00d0088dfa31fb2b292ee34abc6c168
parent274aa610eace6c4ce8b5440a83a88753729cd33c
Merge remote-tracking branch 'origin/erp5-component' into erp5
software/erp5/software.cfg