Merge branch 'erp5' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 14 Feb 2014 08:54:09 +0000 (09:54 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 14 Feb 2014 08:54:09 +0000 (09:54 +0100)
commitedf52de33dde276b83b34d08ec00f1edae2befad
treeb8fec9134bf925420cd6a87fe260bb9df44e1628
parenta0c657d48a7c8aef194eb224f841a586586cea0b
parentbb2d08973672b08e023417f95909de2d22162bd1
Merge branch 'erp5' into erp5-cluster
stack/erp5/buildout.cfg