Merge branch 'erp5-component' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 15:32:40 +0000 (17:32 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 15:32:40 +0000 (17:32 +0200)
commit36562833d3d5cae531daf8f0444de563f1825fed
treef4690c370aa3f8c20362be0cc50b72af7ce5ad17
parent099d6034f7b342417f85e2c1671ba6fe139b6159
parent5a4b864100b8bcb3273e751dd2df8e411075e32e
Merge branch 'erp5-component' into erp5