Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 20 Apr 2013 06:01:18 +0000 (08:01 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 20 Apr 2013 06:01:18 +0000 (08:01 +0200)
commita4c4e57b94e2ad93858d56bda5031c4f2df20322
tree062c58a05131d4039f75ebcbfbf55874e2181720
parent911b6b1b8f4d2fc51c9ce279994aeac35359badc
parent723e9dbb9bd76142d771f396db1c11d5149c76fc
Merge branch 'erp5-component' into erp5