Merge remote-tracking branch 'origin/master' into erp5-cluster
authorJulien Muchembled <jm@nexedi.com>
Wed, 7 Aug 2013 16:32:49 +0000 (18:32 +0200)
committerJulien Muchembled <jm@nexedi.com>
Wed, 7 Aug 2013 16:32:49 +0000 (18:32 +0200)
commit76e6105f106c06996accc70a1e5f674d6603e329
treed22c5e0288903072d3ab688fd987b0e58fd339a7
parentd48538af557fa9f6966ef463e4f1d003e7d2757b
parent3333b07d33c643921d5494765c53baa8055bf3f0
Merge remote-tracking branch 'origin/master' into erp5-cluster

Conflicts:
stack/erp5/instance-tidstorage.cfg.in
stack/erp5/buildout.cfg
stack/erp5/instance-zope.cfg.in
stack/slapos.cfg