Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 20 Apr 2013 06:03:51 +0000 (08:03 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 20 Apr 2013 06:03:51 +0000 (08:03 +0200)
commit13aaf3554a90a008fb804b0466f62b5ff995d917
treefbc462256d593c4408f5bf656119dd519718d323
parent723e9dbb9bd76142d771f396db1c11d5149c76fc
parent9411bfb0c792f1f184351e5ed84323d99f8633a9
Merge branch 'master' into erp5-component