Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Nov 2013 20:12:14 +0000 (21:12 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 29 Nov 2013 20:12:14 +0000 (21:12 +0100)
commitfcf5ea9623385c55cee73f76d1c6667c44345b5c
tree734a8693bc618cdc5db3e66033b5c20db8c1143a
parentd3c04864cd0d6e598e1aff0b4d60ed1dda35788d
parenta331dc3248d6851015969e274e7a3d1effbee072
Merge branch 'erp5-component' into erp5