Merge branch 'erp5' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 15 Jan 2014 09:09:59 +0000 (10:09 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 15 Jan 2014 09:09:59 +0000 (10:09 +0100)
commit18e13b9c112627199b9a4aa0eeb80c28d3e1ec0a
treed2f3718af9b1286e660937c6ce1c1f36a85204f7
parentae5af0005a70cbd200f60f162b443098454b8d12
parenta66d0ff38a0eb75de5f338d064bc63dd9da67fe5
Merge branch 'erp5' into erp5-cluster

Conflicts:
stack/erp5/buildout.cfg
stack/erp5/instance-erp5-cluster.cfg.in
stack/erp5/instance-erp5-single.cfg.in
stack/erp5/instance-kumofs.cfg.in
stack/erp5/instance-zope.cfg.in
stack/erp5/instance.cfg.in
stack/erp5/buildout.cfg
stack/erp5/instance-kumofs.cfg.in
stack/erp5/instance-zope.cfg.in
stack/erp5/instance.cfg.in