Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 2 Jul 2013 21:05:42 +0000 (23:05 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 2 Jul 2013 21:05:42 +0000 (23:05 +0200)
commit33c9775eedd3ff9da7948f49ff99053f85d37940
treed50bff0044d0554ae829f7d863e9fd82ddaffc9c
parentf2d7978f2d7f2acaf3127ed31da64cff45152f0a
parent9b7b0aa7809244ba8de45512d13da0802df5e165
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg