Merge branch 'erp5' into erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 13:10:23 +0000 (14:10 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 13:10:23 +0000 (14:10 +0100)
commitf2ce342da2324f9f1ff2c1e88bff8a435b142ca7
treed464584e264a9fe190c2aca7a9c6537bc06d606f
parent95de18d726a3323c1065260057825a806c7e5bb6
parentba4d028afe2610d50d7bec185bae600ff19a6e0d
Merge branch 'erp5' into erp5-generic