Merge branch 'erp5' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 6 Mar 2014 12:22:46 +0000 (13:22 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 6 Mar 2014 12:22:46 +0000 (13:22 +0100)
commitc4427d2806553961382ee20ab89b03c591cf3d89
treea452376660c88108dc370aace116289df25d5413
parentedf52de33dde276b83b34d08ec00f1edae2befad
parentc2b5180ab7a8b2455ef8be13a33571b161d2b94d
Merge branch 'erp5' into erp5-cluster

Conflicts:
component/findutils/buildout.cfg
stack/erp5/buildout.cfg