Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Aug 2014 20:11:42 +0000 (22:11 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Aug 2014 20:11:42 +0000 (22:11 +0200)
commita19c90c0a440cf268def4c7a33e3f4b28410099e
treeb82fff6e105013965e35a6a3bb3c348307011fe7
parentb80c72ff60bfe0bdf91cfc498481834ddc2ce426
parent259aa9be180c7792680b60640ff0124c1ac9a5a8
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg