Merge remote-tracking branch 'origin/erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 18 Feb 2013 09:29:37 +0000 (10:29 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 18 Feb 2013 09:29:37 +0000 (10:29 +0100)
commit94d18133d48d7539f398798e84532a605f0bea8f
tree6fb612aecff2305811284e44408c66ecfbcaf0d2
parent81e12ea88c723e76bd8f700e08ceb4d6d69cd78b
parent8fb726da6d560be3a352bb041fa6411a5b1a107f
Merge remote-tracking branch 'origin/erp5' into erp5-z2.13

Conflicts:
stack/erp5/buildout.cfg
component/cloudooo/buildout.cfg
stack/erp5/buildout.cfg