Merge branch 'erp5' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Feb 2014 08:47:13 +0000 (09:47 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Feb 2014 08:47:13 +0000 (09:47 +0100)
commit61a5a21c662dbfa45e9796f3c891af51bc8796c4
tree4d29714504e7d3d2d23b5295b37257bae0be305f
parentb7cccaaeff45c8e6b4e7a523179b039d0be515e0
parent22db977298fc798e42bd042bde398b63feffbe0f
Merge branch 'erp5' into erp5-cluster
stack/erp5/buildout.cfg