Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 10 May 2014 18:27:29 +0000 (20:27 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 10 May 2014 18:27:29 +0000 (20:27 +0200)
commitfa06f923fd3f5edb07d0030e3a144fc49df9c313
treeb984d59d0d3628552580b2c0eae7d17407823075
parent130bfbf9d4ec4eefa9ed9e8b427ad6e0ed3298a0
parente489b2f6ce67db7f00b6120489f3dfb8820fab51
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg