Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 09:47:32 +0000 (11:47 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 09:47:32 +0000 (11:47 +0200)
commitc8182486000fdeca16a36c11397d0459b946d0e6
tree0ca2bf14efb96b0b0f6ec75b046ec2295f7ead0b
parent8636f667ee7355389ccfbb1d9d96ac7e76c30100
parent709057279345072f118a24d86128560f1ea83007
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg