Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 15 Oct 2013 08:07:43 +0000 (10:07 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 15 Oct 2013 08:07:43 +0000 (10:07 +0200)
commit9d6253d6b1ff4fb63af52086a4843583dd204776
treed04d09798d8dd42bfd8d9ee8388edaa929f8af22
parentd10e469b6773c63e35c7ecfab7e29531c943ea14
parent1aaece6aa2ba0fa82396c27cfc0873bfc0e46f09
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg