Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 5 Dec 2013 09:24:13 +0000 (10:24 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 5 Dec 2013 09:24:48 +0000 (10:24 +0100)
commit1cd2c3a91981af44d9756d2c27ed360ea78f3e37
treedc737b90674b4ec1cb37314633a75be87554176e
parent31cf158ce937428be220e84401c24ac9d608050b
parent3939c8e1361f60523f4627686cb312fa9b67f259
Merge remote-tracking branch 'origin/master' into erp5-component
stack/erp5/buildout.cfg