Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 16 Jul 2013 22:44:36 +0000 (07:44 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 16 Jul 2013 22:44:36 +0000 (07:44 +0900)
commit7169b70256ae2755f5f9e5bca672d04bf05476b3
tree019ea3d5e31b6c4f8458a1d123e0fb993983f222
parent84c864a875c1e28c1b01629f5129f6edf846cb1d
parentd8c528d01e6e6a6d00cb5cd9298d4baa8665bff8
Merge branch 'master' into erp5-component
stack/erp5/buildout.cfg