Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 27 Mar 2013 09:58:08 +0000 (10:58 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 27 Mar 2013 09:58:08 +0000 (10:58 +0100)
commit11fdd0709539db9b6679c30c7dbb026c960b9027
tree34dd37c605549d2c728cdd097f4fe79576953340
parent6ffbb551fdf1a7c4be5a336580a40453e7adc85f
parent9e672906538fe870a26375180d2c11ad7539b620
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg