Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 7 Jun 2013 14:13:41 +0000 (16:13 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 7 Jun 2013 14:13:41 +0000 (16:13 +0200)
commita7ff5fa9e7087daee47f9502b9739c624167257a
tree664dd495d849bb0475e83d595eb5e400be0ea5a2
parent5d3731e9426d89986e876217a4a9cec3e3a30153
parent382d0ebac914a8db981c9d8b2118fd883e62b451
Merge branch 'erp5' into erp5-z2.13
stack/erp5/buildout.cfg