Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 19 Apr 2013 12:37:42 +0000 (14:37 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 19 Apr 2013 12:37:42 +0000 (14:37 +0200)
commit723e9dbb9bd76142d771f396db1c11d5149c76fc
tree062c58a05131d4039f75ebcbfbf55874e2181720
parente4981ef80f92c074bdad14fa28c3bb8c57fdea27
parent1e343058706c7c9b6e57daeb4734df1f0f59b1b4
Merge branch 'master' into erp5-component