Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 08:14:14 +0000 (10:14 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 30 May 2013 08:14:14 +0000 (10:14 +0200)
commitfd2a411122acad1b8adf9ff6ed019b57210e7d0d
treebf9d559be6e398cbc2e1a57563d19e6f5bbcb5b3
parent164217e4b0668bee41de129540f35c1a20ba3871
parent313ce182a74c50f516930b7acb0cfe370cfa9426
Merge branch 'master' into erp5-component