Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 6 Mar 2014 12:20:24 +0000 (13:20 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 6 Mar 2014 12:20:24 +0000 (13:20 +0100)
commitc2b5180ab7a8b2455ef8be13a33571b161d2b94d
tree9a6adad2208257512b6e5461f5a5ec65f4b1db3e
parentbb2d08973672b08e023417f95909de2d22162bd1
parent14adec734eb037062844db44b0568c112aa6e91b
Merge branch 'erp5-component' into erp5
stack/erp5/buildout.cfg