Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 5 Apr 2013 11:59:15 +0000 (13:59 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 5 Apr 2013 11:59:15 +0000 (13:59 +0200)
commitdc6787549a05ebf4b6c6b1aefab7ca353052f04a
treeff726b45553c507850764abed440b1a587a48892
parentf3b5b979b219baf7bd6d229184db791976346bfc
parent5ca33bc82ace89a7150d0133c882f6242b2c99fb
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg