Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 14 Apr 2014 15:51:01 +0000 (17:51 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 14 Apr 2014 15:51:01 +0000 (17:51 +0200)
commit3badbfb0f47221aab4ebd18ca3621e33cc738c25
tree8dd74c4fe438d8a5868374647b7a506f73158d5b
parent37e8251765da7c80e6470a28c8c07c70ec30e7c6
parent483f3c221328e0fd6acece15c916adb464b23dbb
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg