Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 10 Jan 2014 09:21:19 +0000 (10:21 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 10 Jan 2014 09:21:19 +0000 (10:21 +0100)
commit423c2403af79cdc1c7ebdfd95b1d87fe3a938209
tree924afc4af2cd5e58b4559b695bdfa5b6c5af536e
parentf75d3dbfd653829a1919b8ad226f25ddc15a5155
parentc3c298455a23db6b2ede3a9f63b51378935b5c30
Merge remote-tracking branch 'origin/master' into erp5-component
stack/erp5/buildout.cfg