Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 22:12:44 +0000 (23:12 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Mar 2013 22:12:44 +0000 (23:12 +0100)
commitf3b5b979b219baf7bd6d229184db791976346bfc
treecd33acf099844fec35a7325edf3cc32089c4f0fe
parent8a5ac1573960d6c2c2ec2eed62f88348c219234a
parent8a7291cf4f934a6a63bb671451553f7a4c53b6d4
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg