Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 5 Jul 2013 12:38:08 +0000 (14:38 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 5 Jul 2013 12:38:08 +0000 (14:38 +0200)
commit8732f703ae70f2d5b7623cdaf0af73f76c9ee453
tree32be318f65fb6f598e958f650684778a84d01d73
parent9b7b0aa7809244ba8de45512d13da0802df5e165
parente4ff584b00124f690c0a968b2e0085d9e6e25a25
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg