Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 2 Mar 2013 10:39:54 +0000 (11:39 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 2 Mar 2013 10:39:54 +0000 (11:39 +0100)
commitc632afddd953deda4cbba4a5677d9439dc06d973
treecc781c6319dcc0f0dd3f7bd790069f7040102081
parent40a2387c4186ab519199705eb1f6651c329000fe
parent1ab8b24922c529e01795018e4326c5d7402e31a8
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg