Merge branch 'erp5' into erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Tue, 25 Oct 2011 07:28:15 +0000 (09:28 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 25 Oct 2011 07:28:15 +0000 (09:28 +0200)
commit8cfa4bc0dd3b2a1c4e538289b31d26bf13594263
treea1050a95435fd5b61e28210cd7f6f9ecf36fc38c
parente6230b9d967bf09be3e97661b4a5ae85e6c74162
parent5f664ec611f930b9b3333860e29be3b55363dd9e
Merge branch 'erp5' into erp5-generic