Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 19 Mar 2015 15:24:57 +0000 (16:24 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 19 Mar 2015 15:24:57 +0000 (16:24 +0100)
commit552710dba0856bbf44e8169b931a4930809e3da9
tree75f4f82bda3292193a195ba6779599dafd942c43
parentfb97de696c44e2ff7f8d48107555f9b5d0fa3a0a
parente7bae1933805196f9fde2252f41766156b722c79
Merge remote-tracking branch 'origin/master' into erp5-cluster
stack/erp5/buildout.cfg