Merge branch 'erp5' into erp5-generic
authorRomain Courteaud <romain@nexedi.com>
Tue, 22 Nov 2011 12:55:24 +0000 (13:55 +0100)
committerRomain Courteaud <romain@nexedi.com>
Tue, 22 Nov 2011 12:55:24 +0000 (13:55 +0100)
commite35f136119532a72de6cae3bea1005a9c92b4268
tree7c23beef4fe020be6e6eb5c40d4c9b3c58b920ae
parentd81ee06f46979a62cd595cc93fd82a6d8a22b6b1
parent00b9992c1e2af1d8734dedb709af27ae996738f8
Merge branch 'erp5' into erp5-generic