Merge branch 'erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 24 Jun 2013 14:11:04 +0000 (16:11 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 24 Jun 2013 14:11:04 +0000 (16:11 +0200)
commitf2d7978f2d7f2acaf3127ed31da64cff45152f0a
tree74925d73e8a1d5a22755b94f11fec75f07e65a13
parent92260ac8d2ce7cb54701906523f4419bd2903961
parentc04bdf35070d6f06b3f9d002ea8eb370c6613ecb
Merge branch 'erp5' into erp5-z2.13