Merge branch 'erp5-component' into erp5 slapos
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 16 Jan 2014 08:17:54 +0000 (09:17 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 16 Jan 2014 08:17:54 +0000 (09:17 +0100)
commitd3338d6e4caadbaf86b3a97efa9fd3413654e5de
treefec962e17f10b6dfecd7dd95800767b60025c331
parenta66d0ff38a0eb75de5f338d064bc63dd9da67fe5
parentca8e08e748b28db31a84743b7a62690249abb45d
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg