Merge branch 'erp5-stack' into erp5-component
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 13 Jul 2012 13:05:14 +0000 (15:05 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 13 Jul 2012 13:05:14 +0000 (15:05 +0200)
commit51090e661c1dbacd7a6f07fc13068df812784952
tree516e1e36a7e05a2aef63e6329c33f464d95b8f03
parente953f03316cea9418631e9ff18d85c43d5c2849b
parent815f13ee1ecb5eb7bbb655b175d6ea1feaea9289
Merge branch 'erp5-stack' into erp5-component

Conflicts:
software/erp5/software.cfg