Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 2 Mar 2013 10:39:10 +0000 (11:39 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 2 Mar 2013 10:39:10 +0000 (11:39 +0100)
commit2f524508552a7ff28a520f7f20c6b939638837df
treec4aaca1c09d3b043466ad7983a1ed219e0142524
parent4d12f08f2bd76046f92198dae5604da79d07d5be
parent3ea1c3d832ae7d7a93152da519b214465b29e80c
Merge branch 'erp5-component' into erp5