Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sun, 20 Jul 2014 05:53:15 +0000 (14:53 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sun, 20 Jul 2014 05:53:15 +0000 (14:53 +0900)
commitfe5791fc9ecae74df99af057fa2a5706262cf1b4
tree5928fd0cf7d4fa43229901e27f76270bd23f7a76
parent3a936da2f8f5a02e2ae029f2e1bd570584c5e9fb
parent5156804248130c3d81fc82032077aac8a9982576
Merge remote-tracking branch 'origin/master' into erp5-cluster
stack/erp5/buildout.cfg