Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 24 Jan 2014 12:28:33 +0000 (13:28 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 24 Jan 2014 12:28:33 +0000 (13:28 +0100)
commitd0bce1036b2c316857a6a1abcacdda4d6bc10e30
treeb9fbf9f2ee72b967bf7a9fa446d446b28a1ba26b
parent852f2ddcc9d0e58ee9e3ec34271e4d39686c0a44
parentfaf38f1cd28e93d193b0698757478195824a1915
Merge branch 'erp5-component' into erp5