Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 13:45:19 +0000 (15:45 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 13:45:19 +0000 (15:45 +0200)
commit49eccb432a7816d90a9567f324668b6350942f7d
treef2ef82f2d0bb947bdf5a3f540aa0b68ab2d21ca9
parentc8182486000fdeca16a36c11397d0459b946d0e6
parent099d6034f7b342417f85e2c1671ba6fe139b6159
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg