Merge branch 'erp5' into erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 11:04:06 +0000 (12:04 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 5 Dec 2011 11:04:06 +0000 (12:04 +0100)
commit4804a9f8d967badfbdd0c42d2ca21c38001b4e60
treec41d91fab66453be3cbacacf3972f0e828699419
parent2f548b8521ae73c97f33f685f4828cb3a03a7f8c
parent6a19612ac8e3ff99fd8807e28ff2c2d55647f7b9
Merge branch 'erp5' into erp5-generic