Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 6 Jun 2013 07:23:42 +0000 (09:23 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 6 Jun 2013 07:23:42 +0000 (09:23 +0200)
commit5d3731e9426d89986e876217a4a9cec3e3a30153
tree4cb8ec3fc224232221143bdea364a18c3ba6646c
parent24d8326b0d9dc4fa962c1f8aa113901450521002
parentcce046849ed90eaf1f3bc62db50ff39f33555750
Merge branch 'erp5' into erp5-z2.13
component/python-2.7/buildout.cfg
stack/erp5/buildout.cfg