Merge remote-tracking branch 'origin/master' into erp5-cluster
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 17 Feb 2015 08:44:50 +0000 (09:44 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 17 Feb 2015 08:44:50 +0000 (09:44 +0100)
commitc63d05a61a61b4e2024828117c4dc786b9687c99
tree9bf186d46b14b0f10e710c4d0c4bfa7055814065
parentd181bc7510715dd8761057cce6d3f40cf3a3b6da
parentfc0013d7ac2ae2f3879248507b59b5306991f45a
Merge remote-tracking branch 'origin/master' into erp5-cluster

Conflicts:
stack/erp5/buildout.cfg
stack/erp5/instance-erp5-cluster.cfg.in
stack/erp5/instance-mariadb.cfg.in
stack/erp5/instance-tidstorage.cfg.in
stack/erp5/instance.cfg.in
setup.py
stack/erp5/buildout.cfg