Merge branch 'erp5' into erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 16:51:26 +0000 (17:51 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 16:51:26 +0000 (17:51 +0100)
commit5c9ef43746fcd88951d9999c3275d4947d4954c1
treed464584e264a9fe190c2aca7a9c6537bc06d606f
parentf2ce342da2324f9f1ff2c1e88bff8a435b142ca7
parent9f4b4c8a526180f4cb763de324f1650299439a99
Merge branch 'erp5' into erp5-generic