Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 6 Mar 2013 14:25:24 +0000 (15:25 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 6 Mar 2013 14:25:24 +0000 (15:25 +0100)
commitaae99e196fb6dd7b73182e38aa34a7a22a3b2416
tree34202e5efbc0bff29c127bc4806bf50f380399ec
parent6382f6e89a73549b7008b42be7fc3a6baf8b0f7a
parent12abc1c25d7af7b99be357c754f604a2438ca227
Merge branch 'erp5-component' into erp5