Merge branch 'erp5' into erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Fri, 21 Oct 2011 07:50:38 +0000 (09:50 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Fri, 21 Oct 2011 07:50:38 +0000 (09:50 +0200)
commit724b5ae0ddffc07e04fd74410f07fd2d73570729
tree97b477be70b7dae0ab8d7cbe8a60524382b012fe
parent26e75418a56f1d5ccf3c166b220e92a39e74cb8d
parentefb0a98d1eabe11d1f45bf1da3491810bbdf3175
Merge branch 'erp5' into erp5-generic
software/erp5/software.cfg