Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 5 May 2014 19:14:47 +0000 (21:14 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 5 May 2014 19:14:47 +0000 (21:14 +0200)
commit906dd9d83ee9d5e0f5f3c0cde7b5bac81ae967f5
tree6270b570c172896ed983ed053fa9c81be4506185
parent328800d5363fb3a7e5c39f17f99d52abc38f7dc6
parent0a18a13a7b2d4472f38e0d46d08ca5154d0b8c52
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg