Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Mar 2013 23:19:31 +0000 (00:19 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 8 Mar 2013 23:19:31 +0000 (00:19 +0100)
commit6124e1d64963d75a5fa1d4d69327dc69dcba49b4
tree2d872b3e962464f5aa68f8ff68a2dcf93729f1a1
parentae0edee8f770a1be66dca219b131b6ee52d8c453
parent33d9e196c722d063b23b648b34717e2d196f2eca
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg