Merge remote-tracking branch 'origin/master' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 4 Jun 2015 08:49:42 +0000 (10:49 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 4 Jun 2015 08:49:42 +0000 (10:49 +0200)
commit6555caf4e816a945bfa3f750092b9601809d43d7
tree83aff5b5252a95f52a1564ec057d178ab5080b4e
parente20fb6ea96c70c472c024220ff272e9b3b53cd70
parent2f157b4b611e47d9f7557c6558869bf5173e004e
Merge remote-tracking branch 'origin/master' into erp5-cluster
component/mariadb/buildout.cfg
setup.py
stack/erp5/buildout.cfg