Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 4 Mar 2013 16:48:00 +0000 (17:48 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 4 Mar 2013 16:48:00 +0000 (17:48 +0100)
commit591782d6b2f47dd086eaad8b89708c31e6724daa
tree366682281c0cead567bca345b193397c206bbafa
parent78ef71c504a318f43fc24b3b3ec91d06311eede6
parent6cfce3b6141153daf174bfbfa69480e6db525dac
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg