Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 10 Apr 2014 05:28:17 +0000 (07:28 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 10 Apr 2014 05:28:17 +0000 (07:28 +0200)
commit37e8251765da7c80e6470a28c8c07c70ec30e7c6
tree880dccb09a6254ac88c96f08cd255e71d5197de7
parent4721c89ba35bb6d15db01c70aaccaa5fa177d227
parentef2bbcda56cc2ce70ea5430cd44787b16b59707d
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg