Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 24 Apr 2014 15:25:18 +0000 (17:25 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 24 Apr 2014 15:25:18 +0000 (17:25 +0200)
commitf6946c0ab6b923da6a758550df2c0c222c383dc9
tree24b05b300405993c71f535c2a3800d8e1dd08eff
parent7c6784b7e5f056b9d3faa5c5b3200f0cbcc1277d
parent51031106523e960184cece94a0888b9528e7c0c9
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg