Merge remote-tracking branch 'origin/erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 28 Feb 2013 15:12:07 +0000 (16:12 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 28 Feb 2013 15:12:07 +0000 (16:12 +0100)
commit1cec0090cd470eadd033be9eb83611740b6c46f2
treef64dee827d2ed71efd1b31f500b233a46a51bae5
parent94d18133d48d7539f398798e84532a605f0bea8f
parent4d12f08f2bd76046f92198dae5604da79d07d5be
Merge remote-tracking branch 'origin/erp5' into erp5-z2.13
software/cloudooo/software.cfg
stack/cloudooo.cfg
stack/erp5/buildout.cfg