Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 10 Apr 2014 05:29:04 +0000 (07:29 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 10 Apr 2014 05:29:04 +0000 (07:29 +0200)
commit4dcd2da695e351cebec1f697cc62a1b6563adc9d
treef37d7a7517c70764f5d8837313b522dd873c9ab1
parent9e801ac24f7e3766f3ef42f6495e4ac75ff293eb
parent37e8251765da7c80e6470a28c8c07c70ec30e7c6
Merge remote-tracking branch 'origin/master' into erp5-cluster
stack/erp5/buildout.cfg