Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 4 Mar 2013 16:51:01 +0000 (17:51 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 4 Mar 2013 16:51:01 +0000 (17:51 +0100)
commit92bfb5cae238f6a6f28a2161dbb6ddcd821a2799
tree362047abd9cd0320b4838e49337d28e9a3253479
parentc632afddd953deda4cbba4a5677d9439dc06d973
parent591782d6b2f47dd086eaad8b89708c31e6724daa
Merge branch 'erp5' into erp5-z2.13

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